[Bf-blender-cvs] [85ce444] master: Lattice Editmode: Select Mirror

Campbell Barton noreply at git.blender.org
Mon Dec 9 05:42:13 CET 2013


Commit: 85ce444455efade2772d2c5625a5b78de1d00dba
Author: Campbell Barton
Date:   Mon Dec 9 15:40:41 2013 +1100
http://developer.blender.org/rB85ce444455efade2772d2c5625a5b78de1d00dba

Lattice Editmode: Select Mirror

patch originally by Philipp Oeser with some edits.

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/object/object_intern.h
M	source/blender/editors/object/object_lattice.c
M	source/blender/editors/object/object_ops.c
M	source/blender/makesrna/RNA_enum_types.h
M	source/blender/makesrna/intern/rna_object.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index dd3710f..8174ef3 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -746,6 +746,7 @@ class VIEW3D_MT_select_edit_lattice(Menu):
 
         layout.separator()
 
+        layout.operator("lattice.select_mirror")
         layout.operator("lattice.select_random")
         layout.operator("lattice.select_all").action = 'TOGGLE'
         layout.operator("lattice.select_all", text="Inverse").action = 'INVERT'
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index ce509e2..536f3f0 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -142,6 +142,7 @@ void LATTICE_OT_select_more(struct wmOperatorType *ot);
 void LATTICE_OT_select_less(struct wmOperatorType *ot);
 void LATTICE_OT_select_ungrouped(struct wmOperatorType *ot);
 void LATTICE_OT_select_random(struct wmOperatorType *ot);
+void LATTICE_OT_select_mirror(struct wmOperatorType *ot);
 void LATTICE_OT_make_regular(struct wmOperatorType *ot);
 void LATTICE_OT_flip(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c
index 6379d23..fdc9a60 100644
--- a/source/blender/editors/object/object_lattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -49,6 +49,7 @@
 
 #include "RNA_access.h"
 #include "RNA_define.h"
+#include "RNA_enum_types.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
@@ -226,6 +227,78 @@ void LATTICE_OT_select_random(wmOperatorType *ot)
 	RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection");
 }
 
+
+/* -------------------------------------------------------------------- */
+/* Select Mirror Operator */
+
+static int lattice_select_mirror_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit = CTX_data_edit_object(C);
+	Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt;
+	const bool extend = RNA_boolean_get(op->ptr, "extend");
+	const int axis = RNA_enum_get(op->ptr, "axis");
+	bool flip_uvw[3] = {false};
+	int tot, i;
+	BPoint *bp;
+	BLI_bitmap *selpoints;
+
+	tot = lt->pntsu * lt->pntsv * lt->pntsw;
+
+	flip_uvw[axis] = true;
+
+	if (!extend) {
+		lt->actbp = LT_ACTBP_NONE;
+	}
+
+	/* store "original" selection */
+	selpoints = BLI_BITMAP_NEW(tot, __func__);
+	BKE_lattice_bitmap_from_flag(lt, selpoints, SELECT, false, false);
+
+	/* actual (de)selection */
+	for (i = 0; i < tot; i++) {
+		const int i_flip = BKE_lattice_index_flip(lt, i, flip_uvw[0], flip_uvw[1], flip_uvw[2]);
+		bp = &lt->def[i];
+		if (!bp->hide) {
+			if (BLI_BITMAP_GET(selpoints, i_flip)) {
+				bp->f1 |= SELECT;
+			}
+			else {
+				if (!extend) {
+					bp->f1 &= ~SELECT;
+				}
+			}
+		}
+	}
+
+
+	MEM_freeN(selpoints);
+
+	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+
+	return OPERATOR_FINISHED;
+}
+
+void LATTICE_OT_select_mirror(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Mirror";
+	ot->description = "Select mirrored lattice points";
+	ot->idname = "LATTICE_OT_select_mirror";
+
+	/* api callbacks */
+	ot->exec = lattice_select_mirror_exec;
+	ot->poll = ED_operator_editlattice;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* props */
+	RNA_def_enum(ot->srna, "axis", object_axis_unsigned_items, 0, "Axis", "");
+
+	RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection");
+}
+
+
 /************************** Select More/Less Operator *************************/
 
 static bool lattice_test_bitmap_uvw(Lattice *lt, BLI_bitmap *selpoints, int u, int v, int w, const bool selected)
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 74ac487..efebbe8 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -224,6 +224,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(LATTICE_OT_select_less);
 	WM_operatortype_append(LATTICE_OT_select_ungrouped);
 	WM_operatortype_append(LATTICE_OT_select_random);
+	WM_operatortype_append(LATTICE_OT_select_mirror);
 	WM_operatortype_append(LATTICE_OT_make_regular);
 	WM_operatortype_append(LATTICE_OT_flip);
 
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 2fb1af7..34f5d1f 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -114,6 +114,7 @@ extern EnumPropertyItem rigidbody_object_shape_items[];
 extern EnumPropertyItem rigidbody_constraint_type_items[];
 
 extern EnumPropertyItem object_axis_items[];
+extern EnumPropertyItem object_axis_unsigned_items[];
 
 extern EnumPropertyItem controller_type_items[];
 
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index eb0f302..184e067 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -165,6 +165,14 @@ EnumPropertyItem object_axis_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
+/* for general use (not just object) */
+EnumPropertyItem object_axis_unsigned_items[] = {
+	{0, "X", 0, "X", ""},
+	{1, "Y", 0, "Y", ""},
+	{2, "Z", 0, "Z", ""},
+	{0, NULL, 0, NULL, NULL}
+};
+
 #ifdef RNA_RUNTIME
 
 #include "BLI_math.h"




More information about the Bf-blender-cvs mailing list