Changeset 13041 for OpenSceneGraph/trunk/src/osg/Uniform.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osg/Uniform.cpp (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osg/Uniform.cpp
r11959 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. 3 3 * Copyright (C) 2008 Zebra Imaging 4 4 * 5 * This application is open source and may be redistributed and/or modified 5 * This application is open source and may be redistributed and/or modified 6 6 * freely and without restriction, both in commercial and non commercial 7 7 * applications, as long as this copyright notice is maintained. 8 * 8 * 9 9 * This application is distributed in the hope that it will be useful, 10 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of … … 250 250 _uintArray->getTotalDataSize() ); 251 251 } 252 252 253 253 return -1; // how got here? 254 254 } … … 1497 1497 1498 1498 if (_updateCallback==uc) return; 1499 1499 1500 1500 int delta = 0; 1501 1501 if (_updateCallback.valid()) --delta; … … 1503 1503 1504 1504 _updateCallback = uc; 1505 1505 1506 1506 if (delta!=0) 1507 1507 { … … 1523 1523 1524 1524 if (_eventCallback==ec) return; 1525 1525 1526 1526 int delta = 0; 1527 1527 if (_eventCallback.valid()) --delta; … … 1529 1529 1530 1530 _eventCallback = ec; 1531 1531 1532 1532 if (delta!=0) 1533 1533 { … … 1535 1535 itr!=_parents.end(); 1536 1536 ++itr) 1537 { 1537 { 1538 1538 (*itr)->setNumChildrenRequiringEventTraversal((*itr)->getNumChildrenRequiringEventTraversal()+delta); 1539 1539 }
