[Bf-blender-cvs] [65d135a] master: Texture paint:

[Antony Riakiotakis]

Commit: 65d135a04064ea8b8275d2a1b60245a44274a2bc
Author: Antony Riakiotakis
Date:   Tue Jul 22 19:34:37 2014 +0200
Branches: master
https://developer.blender.org/rB65d135a04064ea8b8275d2a1b60245a44274a2bc

Texture paint:

* paint slots from cycles only include texture image types
* tweaking with select mouse no longer confirms on release

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

M	source/blender/blenkernel/intern/material.c
M	source/blender/editors/sculpt_paint/paint_ops.c

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

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index b3e0f16..27330fb 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1347,7 +1347,7 @@ void BKE_texpaint_slot_refresh_cache(Material *ma, bool use_nodes)
 			return;
 
 		for (node = ma->nodetree->nodes.first; node; node = node->next) {
-			if (node->typeinfo->nclass == NODE_CLASS_TEXTURE)
+			if (node->typeinfo->nclass == NODE_CLASS_TEXTURE && node->typeinfo->type == SH_NODE_TEX_IMAGE && node->id)
 				count++;
 		}
 
@@ -1362,7 +1362,7 @@ void BKE_texpaint_slot_refresh_cache(Material *ma, bool use_nodes)
 		active_node = nodeGetActiveTexture(ma->nodetree);
 
 		for (node = ma->nodetree->nodes.first; node; node = node->next) {
-			if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) {
+			if (node->typeinfo->nclass == NODE_CLASS_TEXTURE && node->typeinfo->type == SH_NODE_TEX_IMAGE && node->id) {
 				if (active_node == node)
 					ma->paint_active_slot = index;
 				ma->texpaintslot[index++].ima = (Image *)node->id;
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index d999aa7..3605ce5 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -1275,7 +1275,6 @@ static void paint_keymap_curve(wmKeyMap *keymap)
 
 	WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", GKEY, KM_PRESS, 0, 0);
 	kmi = WM_keymap_add_item(keymap, "TRANSFORM_OT_translate", EVT_TWEAK_S, KM_ANY, 0, 0);
-	RNA_boolean_set(kmi->ptr, "release_confirm", true);
 	WM_keymap_add_item(keymap, "TRANSFORM_OT_rotate", RKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "TRANSFORM_OT_resize", SKEY, KM_PRESS, 0, 0);
 }