From 65d135a04064ea8b8275d2a1b60245a44274a2bc Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 22 Jul 2014 19:34:37 +0200 Subject: Texture paint: * paint slots from cycles only include texture image types * tweaking with select mouse no longer confirms on release --- source/blender/blenkernel/intern/material.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/material.c') diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index b3e0f16f604..27330fb8db3 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; -- cgit v1.2.3