Commit: 70a49423d9a44a86bd5c77ce8027097c56702b65
Author: Antony Riakiotakis
Date: Wed Aug 27 16:09:24 2014 +0200
Branches: master
https://developer.blender.org/rB70a49423d9a44a86bd5c77ce8027097c56702b65
Do not add new images if material uses nodes, even for blender internal
===================================================================
M source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c
b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 0822cd4..14e1ec5 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4836,7 +4836,7 @@ bool proj_paint_add_slot(bContext *C, Material *ma,
wmOperator *op)
if (ma) {
- if (use_nodes) {
+ if (use_nodes || ma->use_nodes) {
/* not supported for now */
}
else {
@@ -4980,7 +4980,7 @@ static int
texture_paint_delete_texture_paint_slot_exec(bContext *C, wmOperator
ma = give_current_material(ob, ob->actcol);
- if (!ma->texpaintslot)
+ if (!ma->texpaintslot || ma->use_nodes)
return OPERATOR_CANCELLED;
slot = ma->texpaintslot + ma->paint_active_slot;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
