archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for bug #9654: point cache was being reset too often, made

Browse Source 
transforming unrelated objects slow.
This commit is contained in:
Brecht Van Lommel
2008-04-22 21:53:30 +00:00
parent ff26d59577
commit c3d36b0a4b
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1818,7 +1818,7 @@ static unsigned int flush_layer_node(Scene *sce, DagNode *node, int curtime)
} }
/* node was checked to have lasttime != curtime , and is of type ID_OB */ /* node was checked to have lasttime != curtime , and is of type ID_OB */
static void flush_pointcache_reset(DagNode *node, int curtime) static void flush_pointcache_reset(DagNode *node, int curtime, int reset)
{ {
DagAdjList *itA; DagAdjList *itA;
Object *ob; Object *ob;
@@ -1829,9 +1829,15 @@ static void flush_pointcache_reset(DagNode *node, int curtime)
if(itA->node->type==ID_OB) { if(itA->node->type==ID_OB) {
if(itA->node->lasttime!=curtime) { if(itA->node->lasttime!=curtime) {
ob= (Object*)(node->ob); ob= (Object*)(node->ob);
if(reset || (ob->recalc & OB_RECALC)) {
if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH)) if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
ob->recalc |= OB_RECALC_DATA; ob->recalc |= OB_RECALC_DATA;
flush_pointcache_reset(itA->node, curtime);
flush_pointcache_reset(itA->node, curtime, 1);
}
else
flush_pointcache_reset(itA->node, curtime, 0);
} }
} }
} }
@@ -1877,9 +1883,15 @@ void DAG_scene_flush_update(Scene *sce, unsigned int lay, int time)
for(itA = firstnode->child; itA; itA= itA->next) { for(itA = firstnode->child; itA; itA= itA->next) {
if(itA->node->lasttime!=lasttime && itA->node->type==ID_OB) { if(itA->node->lasttime!=lasttime && itA->node->type==ID_OB) {
ob= (Object*)(itA->node->ob); ob= (Object*)(itA->node->ob);
if(ob->recalc & OB_RECALC) {
if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH)) if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
ob->recalc |= OB_RECALC_DATA; ob->recalc |= OB_RECALC_DATA;
flush_pointcache_reset(itA->node, lasttime);
flush_pointcache_reset(itA->node, lasttime, 1);
}
else
flush_pointcache_reset(itA->node, lasttime, 0);
} }
} }
} }