[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39258] branches/soc-2011-radish/source/ blender/editors: Added an error msg for Fix Deforms tool for active mirror modifiers

[Jason Hays]

Revision: 39258
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39258
Author:   jason_hays22
Date:     2011-08-10 15:50:21 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Added an error msg for Fix Deforms tool for active mirror modifiers

Stopped trying to draw verts with subdivision surface modifier active--
or any other time the dm->drawSelectedVerts function is 0.

Modified Paths:
--------------
    branches/soc-2011-radish/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c

Modified: branches/soc-2011-radish/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/object/object_vgroup.c	2011-08-10 14:32:03 UTC (rev 39257)
+++ branches/soc-2011-radish/source/blender/editors/object/object_vgroup.c	2011-08-10 15:50:21 UTC (rev 39258)
@@ -2311,7 +2311,19 @@
 	float distToBe= RNA_float_get(op->ptr,"dist");
 	float strength= RNA_float_get(op->ptr,"strength");
 	float cp= RNA_float_get(op->ptr,"cp");
+	ModifierData *md = ob->modifiers.first;
+
+	while(md) {
+		if(md->type == eModifierType_Mirror && (md->mode&eModifierMode_Realtime)) {
+			break;
+		}
+		md = md->next;
+	}
 	
+	if(md && md->type == eModifierType_Mirror) {
+		BKE_report(op->reports, RPT_ERROR_INVALID_CONTEXT, "This operator does not support an active mirror modifier");
+		return OPERATOR_CANCELLED;
+	}
 	vgroup_fix(scene, ob, distToBe, strength, cp);
 	
 	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);

Modified: branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c	2011-08-10 14:32:03 UTC (rev 39257)
+++ branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c	2011-08-10 15:50:21 UTC (rev 39258)
@@ -2858,7 +2858,7 @@
 		}
 	}
 	// Jason
-	if(paint_vertsel_test(ob)) {
+	if(paint_vertsel_test(ob) && dm->drawSelectedVerts) {
 		glColor3f(0.0f, 0.0f, 0.0f);
 		glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
 		dm->drawSelectedVerts(dm);