diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-08-27 18:09:24 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-08-27 18:09:52 +0400 |
| commit | 70a49423d9a44a86bd5c77ce8027097c56702b65 (patch) | |
| tree | 564145543e1ef4379d068d4b809559faf0fb92d6 /source/blender/editors/sculpt_paint | |
| parent | 17ab65d1bbde9c8bce31e6bc574a4e91bc6917ed (diff) | |
Do not add new images if material uses nodes, even for blender internal
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 0822cd4c72d..14e1ec51758 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; |