[Bf-blender-cvs] [147de2c] master: Fix T46411: Experimental deps graph causes particles to jump around

Sergey Sharybin noreply at git.blender.org
Tue Feb 2 15:44:13 CET 2016


Commit: 147de2c49ea022a5d7bf86e1490a7312be7c90a8
Author: Sergey Sharybin
Date:   Tue Feb 2 15:43:20 2016 +0100
Branches: master
https://developer.blender.org/rB147de2c49ea022a5d7bf86e1490a7312be7c90a8

Fix T46411: Experimental deps graph causes particles to jump around

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

M	source/blender/depsgraph/intern/depsgraph_build_relations.cc

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

diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cc b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
index b0eed96..7e98eef 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
@@ -1122,8 +1122,28 @@ void DepsgraphRelationBuilder::build_particles(Scene *scene, Object *ob)
 				}
 			}
 		}
+
+		if (part->ren_as == PART_DRAW_OB && part->dup_ob) {
+			ComponentKey dup_ob_key(&part->dup_ob->id, DEPSNODE_TYPE_TRANSFORM);
+			add_relation(dup_ob_key,
+			             psys_key,
+			             DEPSREL_TYPE_TRANSFORM,
+			             "Particle Object Visualization");
+		}
 	}
 
+	/* Particle depends on the object transform, so that channel is to be ready
+	 * first.
+	 *
+	 * TODO(sergey): This relation should be altered once real granular update
+	 * is implemented.
+	 */
+	ComponentKey transform_key(&ob->id, DEPSNODE_TYPE_TRANSFORM);
+	add_relation(transform_key,
+	             obdata_ubereval_key,
+	             DEPSREL_TYPE_GEOMETRY_EVAL,
+	             "Partcile Eval");
+
 	/* pointcache */
 	// TODO...
 }




More information about the Bf-blender-cvs mailing list