mirror of
https://github.com/aap/librw.git
synced 2025-12-19 00:49:50 +00:00
Merge branch 'master' of github.com:aap/librw
This commit is contained in:
@@ -249,7 +249,7 @@ AnimInterpolator::addTime(float32 t)
|
||||
}
|
||||
KeyFrameHeader *last = this->getAnimFrame(this->currentAnim->numFrames);
|
||||
KeyFrameHeader *next = (KeyFrameHeader*)this->nextFrame;
|
||||
InterpFrameHeader *ifrm;
|
||||
InterpFrameHeader *ifrm = nil;
|
||||
while(next < last && next->prev->time <= this->currentTime){
|
||||
// find next interpolation frame to expire
|
||||
for(i = 0; i < this->numNodes; i++){
|
||||
|
||||
@@ -204,6 +204,9 @@ struct Skin
|
||||
static Skin *get(Geometry *geo){
|
||||
return *PLUGINOFFSET(Skin*, geo, skinGlobals.geoOffset);
|
||||
}
|
||||
static void set(Geometry *geo, Skin *skin){
|
||||
*PLUGINOFFSET(Skin*, geo, skinGlobals.geoOffset) = skin;
|
||||
}
|
||||
static void setHierarchy(Atomic *atomic, HAnimHierarchy *hier){
|
||||
*PLUGINOFFSET(HAnimHierarchy*, atomic,
|
||||
skinGlobals.atomicOffset) = hier;
|
||||
|
||||
Reference in New Issue
Block a user