diff options
Diffstat (limited to 'source/blender/blenkernel/intern/depsgraph.c')
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 1c36cccf1e6..b9c9572d599 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2471,7 +2471,7 @@ void DAG_ids_check_recalc(Main *bmain, Scene *scene, int time) #define POST_UPDATE_HANDLER_WORKAROUND -void DAG_ids_clear_recalc(Main *bmain) +void DAG_ids_clear_recalc(Main *bmain, Scene *scene) { ListBase *lbarray[MAX_LIBARRAY]; bNodeTree *ntree; @@ -2479,6 +2479,21 @@ void DAG_ids_clear_recalc(Main *bmain) #ifdef POST_UPDATE_HANDLER_WORKAROUND bool have_updated_objects = false; + + if (DAG_id_type_tagged(bmain, ID_OB)) { + DagNode *node; + for (node = scene->theDag->DagNode.first; node; node = node->next) { + if (node->type == ID_OB) { + Object *object = (Object *) node->ob; + if (object->recalc & OB_RECALC_ALL) { + have_updated_objects = true; + break; + } + } + } + } +#else + (void) scene; /* Unused. */ #endif /* loop over all ID types */ @@ -2495,15 +2510,6 @@ void DAG_ids_clear_recalc(Main *bmain) if (id->flag & (LIB_ID_RECALC | LIB_ID_RECALC_DATA)) id->flag &= ~(LIB_ID_RECALC | LIB_ID_RECALC_DATA); -#ifdef POST_UPDATE_HANDLER_WORKAROUND - if (GS(id->name) == ID_OB) { - Object *object = (Object *) id; - if (object->recalc & OB_RECALC_ALL) { - have_updated_objects = true; - } - } -#endif - /* some ID's contain semi-datablock nodetree */ ntree = ntreeFromID(id); if (ntree && (ntree->id.flag & (LIB_ID_RECALC | LIB_ID_RECALC_DATA))) |