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

While checking old bugreports on the todo tracker, found weak issue in

Browse Source 
current depgraph... that's when an object has multiple "parents", which
have different relation types. (one parent moves Object, the other
deforms). In that case the result was undefined.

Solved it nicely with the DAG building code, resulting in quicker flushing
of changes even.
Also noted a bug in the drawview.c 'object_handle_update' call, which
should not check for layers. The DAG flushing clears recalc flags for
invisible layers, if possible. Now need to write that @#!# doc!
This commit is contained in:
Ton Roosendaal
2005-07-17 12:20:08 +00:00
parent 9a26c98605
commit d5ccd35f4c
2 changed files with 68 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,6 +295,7 @@ struct DagForest *build_dag(struct Scene *sce, short mask)
DagNode * node3;
DagNode * scenenode;
DagForest *dag;
DagAdjList *itA;
dag = sce->theDag;
sce->dagisvalid=1;
@@ -431,6 +432,31 @@ struct DagForest *build_dag(struct Scene *sce, short mask)
dag_add_relation(dag,scenenode,node,DAG_RL_SCENE);
}
/* Now all relations were built, but we need to solve 1 exceptional case;
When objects have multiple "parents" (for example parent + constraint working on same object)
the relation type has to be synced. One of the parents can change, and should give same event to child */
/* nodes were callocced, so we can use node->color for temporal storage */
for(node = sce->theDag->DagNode.first; node; node= node->next) {
if(node->type==ID_OB) {
for(itA = node->child; itA; itA= itA->next) {
if(itA->node->type==ID_OB) {
itA->node->color |= itA->type;
}
}
}
}
/* now set relations equal, so that when only one parent changes, the correct recalcs are found */
for(node = sce->theDag->DagNode.first; node; node= node->next) {
if(node->type==ID_OB) {
for(itA = node->child; itA; itA= itA->next) {
if(itA->node->type==ID_OB) {
itA->type |= itA->node->color;
}
}
}
}
// cycle detection and solving
// solve_cycles(dag);
@@ -1166,10 +1192,8 @@ void DAG_scene_sort(struct Scene *sce)
nqueue = queue_create(DAGQUEUEALLOC);
node = sce->theDag->DagNode.first;
while(node) {
for(node = sce->theDag->DagNode.first; node; node= node->next) {
node->color = DAG_WHITE;
node = node->next;
}
time = 1;
@@ -1287,33 +1311,15 @@ static void flush_update_node(DagNode *node, unsigned int layer, int curtime)
/* even nicer, we can clear recalc flags... */
if((all_layer & layer)==0)
ob->recalc &= ~OB_RECALC;
}
else{
/* Object has not RECALC flag */
/* check case where child changes and parent forcing obdata to change */
/* could merge this in with loop above... (ton) */
for(itA = node->child; itA; itA= itA->next) {
/* the relationship is visible */
if(itA->lay & layer) {
if(itA->node->type==ID_OB) {
obc= itA->node->ob;
/* child moves */
if((obc->recalc & OB_RECALC)==OB_RECALC_OB) {
/* parent has deforming info */
if(itA->type & (DAG_RL_OB_DATA|DAG_RL_DATA_DATA)) {
// printf("parent %s changes ob %s\n", ob->id.name, obc->id.name);
obc->recalc |= OB_RECALC_DATA;
}
}
}
}
}
}
/* we only go deeper if node not checked or something changed */
for(itA = node->child; itA; itA= itA->next) {
if(changed || itA->node->lasttime!=curtime)
flush_update_node(itA->node, layer, curtime);
}
}
/* node was checked to have lasttime != curtime , and is of type ID_OB */
@@ -1375,46 +1381,44 @@ void DAG_scene_update_flags(Scene *sce, unsigned int lay)
for(base= sce->base.first; base; base= base->next) {
/* now if DagNode were part of base, the node->lay could be checked... */
/* we do all now, since the scene_flush checks layers */
//if((base->lay & lay)) {
ob= base->object;
/* we do all now, since the scene_flush checks layers and clears recalc flags even */
ob= base->object;
if(ob->ipo) ob->recalc |= OB_RECALC_OB;
else if(ob->constraints.first) ob->recalc |= OB_RECALC_OB;
else if(ob->scriptlink.totscript) ob->recalc |= OB_RECALC_OB;
else if(ob->parent) {
if(ob->parent->type==OB_CURVE) ob->recalc |= OB_RECALC_OB;
}
if(ob->action) ob->recalc |= OB_RECALC_DATA;
else if(ob->nlastrips.first) ob->recalc |= OB_RECALC_DATA;
else if(ob->softflag & OB_SB_ENABLE) ob->recalc |= OB_RECALC_DATA;
else {
Mesh *me;
Curve *cu;
Lattice *lt;
if(ob->ipo) ob->recalc |= OB_RECALC_OB;
else if(ob->constraints.first) ob->recalc |= OB_RECALC_OB;
else if(ob->scriptlink.totscript) ob->recalc |= OB_RECALC_OB;
else if(ob->parent) {
if(ob->parent->type==OB_CURVE) ob->recalc |= OB_RECALC_OB;
switch(ob->type) {
case OB_MESH:
me= ob->data;
if(me->key) ob->recalc |= OB_RECALC_DATA;
else if(ob->effect.first) {
Effect *eff= ob->effect.first;
if(eff->type==EFF_WAVE) ob->recalc |= OB_RECALC_DATA;
}
break;
case OB_CURVE:
case OB_SURF:
cu= ob->data;
if(cu->key) ob->recalc |= OB_RECALC_DATA;
break;
case OB_LATTICE:
lt= ob->data;
if(lt->key) ob->recalc |= OB_RECALC_DATA;
break;
}
if(ob->action) ob->recalc |= OB_RECALC_DATA;
else if(ob->nlastrips.first) ob->recalc |= OB_RECALC_DATA;
else if(ob->softflag & OB_SB_ENABLE) ob->recalc |= OB_RECALC_DATA;
else {
Mesh *me;
Curve *cu;
Lattice *lt;
switch(ob->type) {
case OB_MESH:
me= ob->data;
if(me->key) ob->recalc |= OB_RECALC_DATA;
else if(ob->effect.first) {
Effect *eff= ob->effect.first;
if(eff->type==EFF_WAVE) ob->recalc |= OB_RECALC_DATA;
}
break;
case OB_CURVE:
case OB_SURF:
cu= ob->data;
if(cu->key) ob->recalc |= OB_RECALC_DATA;
break;
case OB_LATTICE:
lt= ob->data;
if(lt->key) ob->recalc |= OB_RECALC_DATA;
break;
}
}
//}
}
}
DAG_scene_flush_update(sce);
}

5
source/blender/src/drawview.c
View File

@@ -2000,10 +2000,9 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
G.f &= ~G_PICKSEL;
}
/* update all objects, ipos, matrices, displists, etc. Flags set by depgraph or manual */
/* update all objects, ipos, matrices, displists, etc. Flags set by depgraph or manual, no layer check here, gets correct flushed */
for(base= G.scene->base.first; base; base= base->next) {
if(base->lay & v3d->lay)
object_handle_update(base->object); // bke_object.h
object_handle_update(base->object); // bke_object.h
}
/* then draw not selected and the duplis, but skip editmode object */