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>2015-01-28 17:34:11 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-01-28 17:34:11 +0300
commitcde9b1b948f03d78e5110aa2def78a6e4cda1504 (patch)
tree0ac26299eb013da610201914016ba85aa6744582 /source/blender/makesrna/intern/rna_material.c
parent17cb55e4427a681fc9a2c17bf8437ce811b852df (diff)
Fix clicking into texpaint slots not changing active image in blender
internal when using nodes. Using nodes in blender internal is not well supported, but there's no harm in allowing this and it will help manu do his texturing better :)
Diffstat (limited to 'source/blender/makesrna/intern/rna_material.c')
-rw-r--r--source/blender/makesrna/intern/rna_material.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 2e4f24fc0ce..7a06b647ae3 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -181,7 +181,7 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *s
bScreen *sc;
Material *ma = ptr->id.data;
- if (ma->use_nodes && ma->nodetree && BKE_scene_use_new_shading_nodes(scene)) {
+ if (ma->use_nodes && ma->nodetree) {
struct bNode *node;
int index = 0;
for (node = ma->nodetree->nodes.first; node; node = node->next) {