[Bf-blender-cvs] [ad288c9c349] blender2.8: Depsgraph: Fix race condition when object is coming from both scene and set

Sergey Sharybin noreply at git.blender.org
Fri Nov 24 17:10:23 CET 2017


Commit: ad288c9c3494f8626af084889515a63e8b2dfe27
Author: Sergey Sharybin
Date:   Fri Nov 24 14:27:54 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBad288c9c3494f8626af084889515a63e8b2dfe27

Depsgraph: Fix race condition when object is coming from both scene and set

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index f9b7a5b1ceb..f2805cc9a7c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -426,6 +426,9 @@ void DepsgraphRelationBuilder::build_group(Object *object, Group *group)
 void DepsgraphRelationBuilder::build_object(Base *base, Object *object)
 {
 	if (object->id.tag & LIB_TAG_DOIT) {
+		if (base != NULL) {
+			build_object_flags(base, object);
+		}
 		return;
 	}
 	object->id.tag |= LIB_TAG_DOIT;



More information about the Bf-blender-cvs mailing list