Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-12 17:33:20 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-12 17:33:20 +0400
commit469979f9cb08640fbc00a43b59eee459460e74e1 (patch)
treed081b67e0d2274a54b876b0dc9618833d5752b1e /source/blender/blenkernel/intern/material.c
parent127c39b8a44df962b1ac20578497b387319efe87 (diff)
Fix material/lamp drivers not working sometimes when they were used by multiple
objects, found while looking into another bug.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r--source/blender/blenkernel/intern/material.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 7e70b9d9cd5..2b7a41933b4 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1133,8 +1133,8 @@ void material_drivers_update(Scene *scene, Material *ma, float ctime)
*/
if (ma->id.flag & LIB_DOIT)
return;
- else
- ma->id.flag |= LIB_DOIT;
+
+ ma->id.flag |= LIB_DOIT;
/* material itself */
if (ma->adt && ma->adt->drivers.first) {
@@ -1145,6 +1145,8 @@ void material_drivers_update(Scene *scene, Material *ma, float ctime)
if (ma->nodetree) {
material_node_drivers_update(scene, ma->nodetree, ctime);
}
+
+ ma->id.flag &= ~LIB_DOIT;
}
/* ****************** */