Changeset 252 for trunk/src/gfx

Timestamp:

06/12/14 12:08:33 (11 years ago)

Author:

epyon

Message:

• animation may be nullptr

Location:

trunk/src/gfx

Files:

• keyframed_mesh.cc (modified) (1 diff)
• skeletal_mesh.cc (modified) (1 diff)

trunk/src/gfx/keyframed_mesh.cc

@@ -118 +118 @@
 void nv::keyframed_mesh::run_animation( animation_entry* a_anim )
 {
-        keyframed_animation_entry * anim = down_cast<keyframed_animation_entry>(a_anim);
-        setup_animation( anim->m_start, anim->m_frames, anim->m_fps, anim->m_looping );
+        if ( a_anim )
+        {
+                keyframed_animation_entry * anim = down_cast<keyframed_animation_entry>(a_anim);
+                m_active = true;
+                setup_animation( anim->m_start, anim->m_frames, anim->m_fps, anim->m_looping );
+        }
+        else
+        {
+                m_active = false;
+        }
 }
 

trunk/src/gfx/skeletal_mesh.cc

@@ -58 +58 @@
 void nv::skeletal_mesh::run_animation( animation_entry* a_anim )
 {
-        skeletal_animation_entry * anim = down_cast<skeletal_animation_entry>(a_anim);
-        setup_animation( anim->m_animation );
+        if ( a_anim != nullptr )
+        {
+                skeletal_animation_entry * anim = down_cast<skeletal_animation_entry>(a_anim);
+                setup_animation( anim->m_animation );
+        }
+        else
+        {
+                setup_animation( nullptr );
+        }
 }