griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenSubdiv: Make new geometry relations ensures dependent data exists on CPU

Browse Source
This commit is contained in:
Sergey Sharybin
2015-08-03 16:04:33 +02:00
parent 7cfb05dcb0
commit 4a0f3bece3
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/depsgraph.c
View File

@@ -1141,7 +1141,14 @@ 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) {
fob1->eval_flags |= DAG_EVAL_NEED_CPU;
if (fob1->type == ID_OB) {
if ((fob1->eval_flags & DAG_EVAL_NEED_CPU) == 0) {
Object *object = fob1->ob;
/* Make sure object has all the data on CPU. */
object->recalc |= OB_RECALC_DATA;
fob1->eval_flags |= DAG_EVAL_NEED_CPU;
}
}
}
#endif

5
source/blender/depsgraph/intern/depsgraph.cc
View File

@@ -357,7 +357,10 @@ DepsRelation *Depsgraph::add_new_relation(OperationDepsNode *from,
#ifdef WITH_OPENSUBDIV
if (type == DEPSREL_TYPE_GEOMETRY_EVAL) {
IDDepsNode *id_to = to->owner->owner;
id_to->eval_flags |= DAG_EVAL_NEED_CPU;
if ((id_to->eval_flags & DAG_EVAL_NEED_CPU) == 0) {
id_to->tag_update(this);
id_to->eval_flags |= DAG_EVAL_NEED_CPU;
}
}
#endif
return rel;