Show
Ignore:
Timestamp:
10/21/09 17:45:13 (4 years ago)
Author:
cedricpinson
Message:

From Cedric Pinson, this commit contains the following change:
* Change ref_ptr to observer_ptr to avoid cross reference and leak in Skinning
* Set invalidate to true to re run the check visitor in Skeleton
* Shallow copy Sampler in channel copy constructor
* Add accessor in VertexInfluence?
* Remove dead code in Timeline.cpp
* Dont force linking in Bone::UpdateBone?, the decision is done by the user or the manager
* Add offset in timeline stats to display each manager on the screen
* Add a flag in animation manager base to enable or not automatic link when modifying the manager

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgAnimation/Channel

    r10581 r10656  
    7878 
    7979        TemplateChannel (const TemplateChannel& channel) : 
    80             Channel(channel), 
    81             _target(new TargetType(*channel.getTargetTyped())), 
    82             _sampler(channel._sampler.get()) 
     80            Channel(channel) 
    8381        { 
     82            if (channel.getTargetTyped()) 
     83                _target = new TargetType(*channel.getTargetTyped()); 
     84 
     85            if (channel.getSamplerTyped()) 
     86                _sampler = new SamplerType(*channel.getSamplerTyped()); 
    8487        } 
    8588 
     
    103106            typename KeyframeContainerType::KeyType key(0, _target->getValue()); 
    104107            // recreate the keyframe container 
    105             _sampler = 0; 
     108            getOrCreateSampler()->setKeyframeContainer(0); 
    106109            getOrCreateSampler()->getOrCreateKeyframeContainer(); 
    107110            // add the key