From b556ad0d8a0c0f91636cd573dc6cd7d0f5cca03c Mon Sep 17 00:00:00 2001 From: aap Date: Mon, 25 Jul 2016 12:45:08 +0200 Subject: [PATCH] small change for windows/3ds max plugin --- librw.vcxproj | 117 +++++++++++++++++++++++++++++------------------- src/anim.cpp | 2 +- src/rwplugins.h | 3 ++ 3 files changed, 76 insertions(+), 46 deletions(-) diff --git a/librw.vcxproj b/librw.vcxproj index 191a9e4..e866b97 100644 --- a/librw.vcxproj +++ b/librw.vcxproj @@ -26,6 +26,78 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {30552BB0-3B19-49A4-ABF4-87CF68AF9E38} librw @@ -186,51 +258,6 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/anim.cpp b/src/anim.cpp index 8194b71..af4cc82 100644 --- a/src/anim.cpp +++ b/src/anim.cpp @@ -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++){ diff --git a/src/rwplugins.h b/src/rwplugins.h index 00a2feb..8793d7e 100644 --- a/src/rwplugins.h +++ b/src/rwplugins.h @@ -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;