[Bf-blender-cvs] [4eb34db] blender-v2.76a-release: OpenSubdiv: Fix wrong handling of vertex parent

Sergey Sharybin noreply at git.blender.org
Thu Oct 29 11:40:38 CET 2015


Commit: 4eb34dbc8884259e0660c825507b3460f768a4f8
Author: Sergey Sharybin
Date:   Tue Oct 27 20:44:14 2015 +0500
Branches: blender-v2.76a-release
https://developer.blender.org/rB4eb34dbc8884259e0660c825507b3460f768a4f8

OpenSubdiv: Fix wrong handling of vertex parent

Vertex parent was not registered as CPU data requirement.

Should be in the 'a' release.

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

M	source/blender/blenkernel/intern/depsgraph.c

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

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 4373e79..ea8475f 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1140,7 +1140,7 @@ void dag_add_relation(DagForest *forest, DagNode *fob1, DagNode *fob2, short rel
 
 	/* TODO(sergey): Find a better place for this. */
 #ifdef WITH_OPENSUBDIV
-	if ((rel & DAG_RL_DATA_DATA) != 0) {
+	if ((rel & (DAG_RL_DATA_DATA | DAG_RL_DATA_OB)) != 0) {
 		if (fob1->type == ID_OB) {
 			if ((fob1->eval_flags & DAG_EVAL_NEED_CPU) == 0) {
 				Object *ob2 = fob2->ob;




More information about the Bf-blender-cvs mailing list