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/Material/Base/OSGChunkMaterialBase.cpp

    r658 r660  
    681681#endif 
    682682 
    683 void ChunkMaterialBase::resolveLinks(UInt32             uiCurrentAspect, 
    684                                      AspectOffsetStore &oOffsets) 
    685 { 
    686     Inherited::resolveLinks(uiCurrentAspect, oOffsets); 
     683void ChunkMaterialBase::resolveLinks(void) 
     684{ 
     685    Inherited::resolveLinks(); 
     686 
     687#ifdef OSG_MT_CPTR_ASPECT 
     688    AspectOffsetStore oOffsets; 
     689 
     690    _pAspectStore->fillOffsetArray(oOffsets, this); 
     691#endif 
     692 
    687693 
    688694    static_cast<ChunkMaterial *>(this)->clearChunks(); 
    689695 
    690     _mfSlots.terminateShare(uiCurrentAspect, oOffsets); 
     696#ifdef OSG_MT_CPTR_ASPECT 
     697    _mfSlots.terminateShare(Thread::getCurrentAspect(),  
     698                                      oOffsets); 
     699#endif 
    691700} 
    692701