Changeset 13041 for OpenSceneGraph/trunk/src/osg/StateAttribute.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osg/StateAttribute.cpp (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osg/StateAttribute.cpp
r11931 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * 3 * This application is open source and may be redistributed and/or modified 3 * This application is open source and may be redistributed and/or modified 4 4 * freely and without restriction, both in commercial and non commercial 5 5 * applications, as long as this copyright notice is maintained. 6 * 6 * 7 7 * This application is distributed in the hope that it will be useful, 8 8 * but WITHOUT ANY WARRANTY; without even the implied warranty of … … 29 29 OSG_DEBUG_FP<<"Adding parent"<<getRefMutex()<<std::endl; 30 30 OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex()); 31 31 32 32 _parents.push_back(object); 33 33 } … … 36 36 { 37 37 OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex()); 38 38 39 39 ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),object); 40 40 if (pitr!=_parents.end()) _parents.erase(pitr); … … 47 47 48 48 if (_updateCallback==uc) return; 49 49 50 50 int delta = 0; 51 51 if (_updateCallback.valid()) --delta; … … 53 53 54 54 _updateCallback = uc; 55 55 56 56 if (delta!=0) 57 57 { … … 74 74 75 75 if (_eventCallback==ec) return; 76 76 77 77 int delta = 0; 78 78 if (_eventCallback.valid()) --delta; … … 80 80 81 81 _eventCallback = ec; 82 82 83 83 if (delta!=0) 84 84 {
