[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38792] branches/soc-2011-pepper/source: This allows the game engine to build again, but I'm not sure if it' s the best approach.
Mitchell Stokes
mogurijin at gmail.com
Thu Jul 28 17:07:32 CEST 2011
Revision: 38792
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38792
Author: moguri
Date: 2011-07-28 15:07:32 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
This allows the game engine to build again, but I'm not sure if it's the best approach. Aligorith: feel free to revert this if there is a better solution.
Modified Paths:
--------------
branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-pepper/source/gameengine/Converter/BL_ShapeDeformer.cpp
Modified: branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c 2011-07-28 14:40:14 UTC (rev 38791)
+++ branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c 2011-07-28 15:07:32 UTC (rev 38792)
@@ -2151,7 +2151,6 @@
*/
void BKE_animsys_evaluate_animdata (Scene *scene, ID *id, AnimData *adt, float ctime, short recalc)
{
- Main *bmain = G.main; // xxx - to get passed in!
PointerRNA id_ptr;
/* sanity checks */
@@ -2203,8 +2202,12 @@
animsys_evaluate_overrides(&id_ptr, adt);
/* execute and clear all cached property update functions */
- RNA_property_update_cache_flush(bmain, scene);
- RNA_property_update_cache_free();
+ if (scene)
+ {
+ Main *bmain = G.main; // xxx - to get passed in!
+ RNA_property_update_cache_flush(bmain, scene);
+ RNA_property_update_cache_free();
+ }
/* clear recalc flag now */
adt->recalc= 0;
Modified: branches/soc-2011-pepper/source/gameengine/Converter/BL_ShapeDeformer.cpp
===================================================================
--- branches/soc-2011-pepper/source/gameengine/Converter/BL_ShapeDeformer.cpp 2011-07-28 14:40:14 UTC (rev 38791)
+++ branches/soc-2011-pepper/source/gameengine/Converter/BL_ShapeDeformer.cpp 2011-07-28 15:07:32 UTC (rev 38792)
@@ -139,7 +139,7 @@
m_armobj->ApplyPose();
// We don't need an actual time, just use 0
- BKE_animsys_evaluate_animdata(&GetKey()->id, GetKey()->adt, 0.f, ADT_RECALC_DRIVERS);
+ BKE_animsys_evaluate_animdata(NULL, &GetKey()->id, GetKey()->adt, 0.f, ADT_RECALC_DRIVERS);
ForceUpdate();
m_armobj->RestorePose();
More information about the Bf-blender-cvs
mailing list