[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57494] trunk/blender/source/blender/ editors: resolve [#33374] Extrude and mirror editing

Campbell Barton ideasman42 at gmail.com
Sun Jun 16 07:35:45 CEST 2013


Revision: 57494
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57494
Author:   campbellbarton
Date:     2013-06-16 05:35:44 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
resolve [#33374] Extrude and mirror editing

mirror editing option was only added to extrude so mirror editing would always be disabled.
the option is now hidden to avoid confusing users.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_transform.h
    trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
    trunk/blender/source/blender/editors/mesh/editmesh_rip.c
    trunk/blender/source/blender/editors/transform/transform_ops.c

Modified: trunk/blender/source/blender/editors/include/ED_transform.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_transform.h	2013-06-16 05:13:12 UTC (rev 57493)
+++ trunk/blender/source/blender/editors/include/ED_transform.h	2013-06-16 05:35:44 UTC (rev 57494)
@@ -137,6 +137,7 @@
 /* to be able to add operator properties to other operators */
 
 #define P_MIRROR        (1 << 0)
+#define P_MIRROR_DUMMY  (P_MIRROR | (1 << 9))
 #define P_PROPORTIONAL  (1 << 1)
 #define P_AXIS          (1 << 2)
 #define P_SNAP          (1 << 3)
@@ -145,6 +146,7 @@
 #define P_CONSTRAINT    (1 << 6)
 #define P_OPTIONS       (1 << 7)
 #define P_CORRECT_UV    (1 << 8)
+#define P_NO_DEFAULTS   (1 << 10)
 
 void Transform_Properties(struct wmOperatorType *ot, int flags);
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_extrude.c	2013-06-16 05:13:12 UTC (rev 57493)
+++ trunk/blender/source/blender/editors/mesh/editmesh_extrude.c	2013-06-16 05:35:44 UTC (rev 57494)
@@ -46,6 +46,7 @@
 
 #include "ED_mesh.h"
 #include "ED_screen.h"
+#include "ED_transform.h"
 #include "ED_view3d.h"
 
 #include "mesh_intern.h"  /* own include */
@@ -429,7 +430,7 @@
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
+	Transform_Properties(ot, P_NO_DEFAULTS | P_MIRROR_DUMMY);
 }
 
 static int edbm_extrude_verts_exec(bContext *C, wmOperator *op)
@@ -460,7 +461,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* to give to transform */
-	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
+	Transform_Properties(ot, P_NO_DEFAULTS | P_MIRROR_DUMMY);
 }
 
 static int edbm_extrude_edges_exec(bContext *C, wmOperator *op)
@@ -491,7 +492,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* to give to transform */
-	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
+	Transform_Properties(ot, P_NO_DEFAULTS | P_MIRROR_DUMMY);
 }
 
 static int edbm_extrude_faces_exec(bContext *C, wmOperator *op)
@@ -521,7 +522,7 @@
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
+	Transform_Properties(ot, P_NO_DEFAULTS | P_MIRROR_DUMMY);
 }
 
 /* *************** add-click-mesh (extrude) operator ************** */

Modified: trunk/blender/source/blender/editors/mesh/editmesh_rip.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2013-06-16 05:13:12 UTC (rev 57493)
+++ trunk/blender/source/blender/editors/mesh/editmesh_rip.c	2013-06-16 05:35:44 UTC (rev 57494)
@@ -1055,7 +1055,6 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* to give to transform */
-	Transform_Properties(ot, P_PROPORTIONAL);
-	RNA_def_boolean(ot->srna, "mirror", false, "Mirror Editing", "");
+	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR_DUMMY);
 	RNA_def_boolean(ot->srna, "use_fill", false, "Fill", "Fill the ripped region");
 }

Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c	2013-06-16 05:13:12 UTC (rev 57493)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c	2013-06-16 05:35:44 UTC (rev 57494)
@@ -500,7 +500,11 @@
 	}
 
 	if (flags & P_MIRROR) {
-		RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
+		prop = RNA_def_boolean(ot->srna, "mirror", 0, "Mirror Editing", "");
+		if (flags & P_MIRROR_DUMMY) {
+			/* only used so macros can disable this option */
+			RNA_def_property_flag(prop, PROP_HIDDEN);
+		}
 	}
 
 
@@ -539,9 +543,11 @@
 		RNA_def_boolean(ot->srna, "correct_uv", 0, "Correct UVs", "Correct UV coordinates when transforming");
 	}
 
-	// Add confirm method all the time. At the end because it's not really that important and should be hidden only in log, not in keymap edit
-	/*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "Always confirm operation when releasing button");
-	//RNA_def_property_flag(prop, PROP_HIDDEN);
+	if ((flags & P_NO_DEFAULTS) == 0) {
+		// Add confirm method all the time. At the end because it's not really that important and should be hidden only in log, not in keymap edit
+		/*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "Always confirm operation when releasing button");
+		//RNA_def_property_flag(prop, PROP_HIDDEN);
+	}
 }
 
 static void TRANSFORM_OT_translate(struct wmOperatorType *ot)




More information about the Bf-blender-cvs mailing list