Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2011-07-28 19:07:32 +0400
committerMitchell Stokes <mogurijin@gmail.com>2011-07-28 19:07:32 +0400
commiteb7b1f0c58fcf239f353f1cb967882a536f50737 (patch)
tree5e8f70e25c0d25b3978b9aa2e53c314435aba6fc /source/blender/blenkernel/intern/anim_sys.c
parentbd6ca0570e089afc1d29b4f18b8bb6cc086545ea (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
-rw-r--r--source/blender/blenkernel/intern/anim_sys.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 3e59accc599..a3d0377b196 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2151,7 +2151,6 @@ static void animsys_evaluate_overrides (PointerRNA *ptr, AnimData *adt)
*/
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 @@ void BKE_animsys_evaluate_animdata (Scene *scene, ID *id, AnimData *adt, float c
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;