Add operator that deletes a texture paint layer for blender internal.

6 files changed, 66 insertions, 2 deletions

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index ab33c2b740d..6daf000aae3 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1388,7 +1388,10 @@ void BKE_texpaint_slot_refresh_cache(Material *ma, bool use_nodes)
 		for (mtex = ma->mtex, i = 0; i < MAX_MTEX; i++, mtex++) {
 			if (get_mtex_slot_valid_texpaint(*mtex)) {
 				ma->texpaintslot[index].ima = (*mtex)->tex->ima;
-				ma->texpaintslot[index++].uvname = (*mtex)->uvname;
+				ma->texpaintslot[index].uvname = (*mtex)->uvname;
+				ma->texpaintslot[index].mtex = *mtex;
+				
+				index++;
 			}
 		}
 	}
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 643e4aa37cd..614c16654bb 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4966,3 +4966,59 @@ void PAINT_OT_add_texture_paint_slot(wmOperatorType *ot)
 	             "Generated Type", "Fill the image with a grid for UV map testing");
 	RNA_def_boolean(ot->srna, "float", 0, "32 bit Float", "Create image with 32 bit floating point bit depth");
 }
+
+static int texture_paint_delete_texture_paint_slot_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	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);
+	TexPaintSlot *slot;
+	int i;
+	
+	/* not supported for node-based engines */
+	if (!ob || use_nodes)
+		return OPERATOR_CANCELLED;
+	
+	ma = give_current_material(ob, ob->actcol);
+	
+	if (!ma->texpaintslot)
+		return OPERATOR_CANCELLED;
+	
+	slot = ma->texpaintslot + ma->paint_active_slot;
+	
+	/* find the material texture slot that corresponds to the current slot */
+	for (i = 0; i < MAX_MTEX; i++) {
+		if (ma->mtex[i] == slot->mtex) {
+			if (ma->mtex[i]->tex)
+				id_us_min(&ma->mtex[i]->tex->id);
+			MEM_freeN(ma->mtex[i]);
+			ma->mtex[i] = NULL;
+			
+			BKE_texpaint_slot_refresh_cache(ma, false);
+			DAG_id_tag_update(&ma->id, 0);
+			WM_event_add_notifier(C, NC_MATERIAL, CTX_data_scene(C));
+			/* we need a notifier for data change since we change the displayed modifier uvs */
+			WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);			
+			return OPERATOR_FINISHED;
+		}
+	}
+	
+	return OPERATOR_CANCELLED;
+}
+
+
+void PAINT_OT_delete_texture_paint_slot(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Delete Texture Paint Slot";
+	ot->description = "Add a texture paint slot";
+	ot->idname = "PAINT_OT_delete_texture_paint_slot";
+
+	/* api callbacks */
+	ot->exec = texture_paint_delete_texture_paint_slot_exec;
+	ot->poll = ED_operator_region_view3d_active;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 57285ad9bb6..8d42bbb7800 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -184,6 +184,7 @@ void PAINT_OT_texture_paint_toggle(struct wmOperatorType *ot);
 void PAINT_OT_project_image(struct wmOperatorType *ot);
 void PAINT_OT_image_from_view(struct wmOperatorType *ot);
 void PAINT_OT_add_texture_paint_slot(struct wmOperatorType *ot);
+void PAINT_OT_delete_texture_paint_slot(struct wmOperatorType *ot);
 void PAINT_OT_image_paint(struct wmOperatorType *ot);
 
 /* uv sculpting */
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index 3605ce5f280..90161fa87dd 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -1083,6 +1083,7 @@ void ED_operatortypes_paint(void)
 	WM_operatortype_append(PAINT_OT_image_from_view);
 	WM_operatortype_append(PAINT_OT_brush_colors_flip);
 	WM_operatortype_append(PAINT_OT_add_texture_paint_slot);
+	WM_operatortype_append(PAINT_OT_delete_texture_paint_slot);
 
 	/* weight */
 	WM_operatortype_append(PAINT_OT_weight_paint_toggle);
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index ba617baa4e0..bd791c9c006 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -86,6 +86,7 @@ typedef struct GameSettings {
 typedef struct TexPaintSlot {
 	struct Image *ima; /* image to be painted on */
 	char *uvname; /* customdata index for uv layer, MAX_NAME*/
+	struct MTex *mtex; /* hook for blender internal materials. Not terribily nice, but serves for usability now  */
 } TexPaintSlot;
 
 typedef struct Material {
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 70da4ab0fa0..4031c70a7ef 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -2211,7 +2211,9 @@ static void rna_def_tex_slot(BlenderRNA *brna)
 	RNA_def_property_string_sdna(prop, NULL, "uvname");
 	RNA_def_property_ui_text(prop, "UV Map", "Name of UV map");
 	RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_Material_update");
-
+	
+	prop = RNA_def_property(srna, "mtex", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "MaterialTextureSlot");
 }