diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-08-27 20:16:50 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-08-27 20:16:50 +0400 |
| commit | a77b46fbe6c04dc9369a83dda465da4d511cd10d (patch) | |
| tree | 07c94286e298a7fb6398e1b67740df2351839f62 | |
| parent | fa6080bf332b50ec75b8cef6584fa7566fbe356b (diff) | |
Do not add add/remove textures in texpaint if renderer is not blender
internal.
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 14e1ec51758..11501d1cf72 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4826,7 +4826,7 @@ bool proj_paint_add_slot(bContext *C, Material *ma, wmOperator *op) { Object *ob = CTX_data_active_object(C); Scene *scene = CTX_data_scene(C); - bool use_nodes = BKE_scene_use_new_shading_nodes(scene); + bool is_blender_internal = BKE_scene_uses_blender_internal(scene); if (!ob) return false; @@ -4836,7 +4836,7 @@ bool proj_paint_add_slot(bContext *C, Material *ma, wmOperator *op) if (ma) { - if (use_nodes || ma->use_nodes) { + if (!is_blender_internal || ma->use_nodes) { /* not supported for now */ } else { @@ -4970,12 +4970,12 @@ static int texture_paint_delete_texture_paint_slot_exec(bContext *C, wmOperator Object *ob = CTX_data_active_object(C); Scene *scene = CTX_data_scene(C); Material *ma; - bool use_nodes = BKE_scene_use_new_shading_nodes(scene); + bool is_blender_internal = BKE_scene_uses_blender_internal(scene); TexPaintSlot *slot; int i; /* not supported for node-based engines */ - if (!ob || use_nodes) + if (!ob || !is_blender_internal) return OPERATOR_CANCELLED; ma = give_current_material(ob, ob->actcol); |