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:
authorAntony Riakiotakis <kalast@gmail.com>2014-08-27 17:52:24 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-08-27 17:52:24 +0400
commit57ccd29caead1d2e07014dc320e3bd8caeaf8436 (patch)
tree17a04d5452db7071da0e9d80ae0ff66ac03f55e7 /source/blender/blenkernel/intern/depsgraph.c
parent4e3f76e06b6654d4951a54804eaa808b040ef942 (diff)
Only calculate texture paint slots from mtex if renderer is blender
internal. This should eliminate some confusion when people use external render engines.
Diffstat (limited to 'source/blender/blenkernel/intern/depsgraph.c')
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 5e01f9add1e..895e542ca52 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2497,11 +2497,10 @@ static void dag_id_flush_update(Main *bmain, Scene *sce, ID *id)
}
if (ELEM(idtype, ID_MA, ID_TE)) {
- const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(sce);
for (obt = bmain->object.first; obt; obt = obt->id.next) {
if (obt->mode & OB_MODE_TEXTURE_PAINT) {
obt->recalc |= OB_RECALC_DATA;
- BKE_texpaint_slots_refresh_object(obt, new_shading_nodes);
+ BKE_texpaint_slots_refresh_object(sce, obt);
lib_id_recalc_data_tag(bmain, &obt->id);
}
}