archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Texture paint:

Browse Source 
* paint slots from cycles only include texture image types
* tweaking with select mouse no longer confirms on release
This commit is contained in:
Antonis Ryakiotakis
2014-07-22 19:34:37 +02:00
parent 63fcaa8002
commit 65d135a040
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/material.c
View File

@@ -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;

1
source/blender/editors/sculpt_paint/paint_ops.c
View File

@@ -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);
}