[Bf-blender-cvs] [cde9b1b] master: Fix clicking into texpaint slots not changing active image in blender internal when using nodes.

[Antony Riakiotakis]

Commit: cde9b1b948f03d78e5110aa2def78a6e4cda1504
Author: Antony Riakiotakis
Date:   Wed Jan 28 15:34:11 2015 +0100
Branches: master
https://developer.blender.org/rBcde9b1b948f03d78e5110aa2def78a6e4cda1504

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 :)

===================================================================

M	source/blender/makesrna/intern/rna_material.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 2e4f24f..7a06b64 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) {