[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32488] trunk/blender/source/blender/ editors/render/render_shading.c: Fix for [#21822] Unusual material slot behaviour, edit v object mode, cascade, SVN 27833

[Janne Karhu]

Revision: 32488
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32488
Author:   jhk
Date:     2010-10-15 10:11:26 +0200 (Fri, 15 Oct 2010)

Log Message:
-----------
Fix for [#21822] Unusual material slot behaviour, edit v object mode, cascade, SVN 27833
* Disabled removing material slots in edit mode and added back error message from 2.49.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_shading.c

Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c	2010-10-15 07:31:26 UTC (rev 32487)
+++ trunk/blender/source/blender/editors/render/render_shading.c	2010-10-15 08:11:26 UTC (rev 32488)
@@ -289,6 +289,12 @@
 	if(!ob)
 		return OPERATOR_CANCELLED;
 
+	/* Removing material slots in edit mode screws things up, see bug #21822.*/
+	if(ob == CTX_data_edit_object(C)) {
+		BKE_report(op->reports, RPT_ERROR, "Unable to remove material slot in edit mode.");
+		return OPERATOR_CANCELLED;
+	}
+
 	object_remove_material_slot(ob);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_OBJECT|ND_OB_SHADING, ob);