Show
Ignore:
Timestamp:
04/06/07 00:00:32 (2 years ago)
Author:
vossg
Message:

fixed : improved multi aspect value field deletion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/mixin-collappse/Source/System/Depreciated/State/OSGTextureChunkBase.cpp

    r658 r660  
    42654265#endif 
    42664266 
    4267 void TextureChunkBase::resolveLinks(UInt32             uiCurrentAspect, 
    4268                                      AspectOffsetStore &oOffsets) 
    4269 { 
    4270     Inherited::resolveLinks(uiCurrentAspect, oOffsets); 
     4267void TextureChunkBase::resolveLinks(void) 
     4268{ 
     4269    Inherited::resolveLinks(); 
    42714270 
    42724271    static_cast<TextureChunk *>(this)->setImage(NullFC); 
    42734272 
    4274     _mfShaderOffsetMatrix.terminateShare(uiCurrentAspect, oOffsets); 
     4273#ifdef OSG_MT_CPTR_ASPECT 
     4274    AspectOffsetStore oOffsets; 
     4275 
     4276    _pAspectStore->fillOffsetArray(oOffsets, this); 
     4277#endif 
     4278 
     4279 
     4280#ifdef OSG_MT_CPTR_ASPECT 
     4281    _mfShaderOffsetMatrix.terminateShare(Thread::getCurrentAspect(),  
     4282                                      oOffsets); 
     4283#endif 
    42754284} 
    42764285