Commit: 52dd5c5fcf12ddbe7a92fb98190219c235e2eab4
Author: Sergey Sharybin
Date: Mon Aug 28 11:44:39 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB52dd5c5fcf12ddbe7a92fb98190219c235e2eab4
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/depsgraph/intern/depsgraph_tag.cc
index 38919fb890e,f73bb65e5dc..6d5a2e3628e
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@@ -93,23 -93,24 +93,23 @@@ void lib_id_recalc_data_tag(Main *bmain
DEG_id_type_tag(bmain, GS(id->name));
}
+namespace {
+
void lib_id_recalc_tag_flag(Main *bmain, ID *id, int flag)
{
+ /* This bit of code ensures legacy object->recalc flags are still
filled in
+ * the same way as it was expected with the old dependency graph.
+ *
+ * This is because some areas like motion paths and likely some other
+ * physics baking process are doing manual scene update on all the
frames,
+ * trying to minimize number of updates.
+ *
+ * But this flag will also let us to re-construct entry nodes for update
+ * after relations update and after layer visibility changes.
+ */
if (flag) {
- short id_type = GS(id->name);
- /* This bit of code ensures legacy object->recalc flags
- * are still filled in the same way as it was expected
- * with the old dependency graph.
- *
- * This is because some areas like motion paths and likely
- * some other physics baking process are doing manual scene
- * update on all the frames, trying to minimize number of
- * updates.
- *
- * But this flag will also let us to re-construct entry
- * nodes for update after relations update and after layer
- * visibility changes.
- */
- ID_Type idtype = GS(id->name);
- if (idtype == ID_OB) {
++ ID_Type id_type = GS(id->name);
+ if (id_type == ID_OB) {
Object *object = (Object *)id;
object->recalc |= (flag & OB_RECALC_ALL);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
