diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-05 15:52:54 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-05 15:52:54 +0400 |
commit | 5bacd2df29855e0628d8a48c1f0321b8d1c429ac (patch) | |
tree | 15e04f801a63a4b1dd61108efba4e321a30c0b9f /source | |
parent | 052ab934aa3adb3ab3ce8e875618986fb69f0d57 (diff) |
Fix #22666: linked data lights lag during transform in GLSL mode.
Actually a depsgraph issue, transforming objects was incorrectly
tagging their data for recalculation.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index c1223a5c37f..0dbdd802ff6 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2303,8 +2303,10 @@ void DAG_id_flush_update(ID *id, short flag) id= ob->data; /* no point in trying in this cases */ - if(!id || id->us <= 1) + if(id && id->us <= 1) { + dag_editors_update(bmain, id); id= NULL; + } } } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 80973918673..98ecb07660f 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -810,7 +810,7 @@ void recalcData(TransInfo *t) /* sets recalc flags fully, instead of flushing existing ones * otherwise proxies don't function correctly */ - DAG_id_flush_update(&ob->id, OB_RECALC_ALL); // XXX: OB_RECALC_OB only? + DAG_id_flush_update(&ob->id, OB_RECALC_OB); } } |