Differential D481 Diff 2137 source/blender/editors/mesh/editmesh_add.c

Changeset View

Standalone View

source/blender/editors/mesh/editmesh_add.c

Show All 23 Lines
*		*
* *** END GPL LICENSE BLOCK ***		* *** END GPL LICENSE BLOCK ***
*/		*/

/** \file blender/editors/mesh/editmesh_add.c		/** \file blender/editors/mesh/editmesh_add.c
* \ingroup edmesh		* \ingroup edmesh
*/		*/

		#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"		#include "DNA_object_types.h"
#include "DNA_scene_types.h"		#include "DNA_scene_types.h"


#include "BLF_translation.h"		#include "BLF_translation.h"

#include "BKE_context.h"		#include "BKE_context.h"
#include "BKE_library.h"		#include "BKE_library.h"
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines
static int add_primitive_plane_exec(bContext C, wmOperator op)		static int add_primitive_plane_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
bool was_editmode;		bool was_editmode;
unsigned int layer;		unsigned int layer;
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Plane"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Plane"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs)
		ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_grid x_segments=%i y_segments=%i size=%f matrix=%m4",		"create_grid x_segments=%i y_segments=%i size=%f matrix=%m4 calc_uvs=%b",
1, 1, RNA_float_get(op->ptr, "radius"), mat))		1, 1, RNA_float_get(op->ptr, "radius"), mat, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
}		}

void MESH_OT_primitive_plane_add(wmOperatorType *ot)		void MESH_OT_primitive_plane_add(wmOperatorType *ot)
{		{
/* identifiers */		/* identifiers */
ot->name = "Add Plane";		ot->name = "Add Plane";
ot->description = "Construct a filled planar mesh with 4 vertices";		ot->description = "Construct a filled planar mesh with 4 vertices";
ot->idname = "MESH_OT_primitive_plane_add";		ot->idname = "MESH_OT_primitive_plane_add";

/* api callbacks */		/* api callbacks */
ot->exec = add_primitive_plane_exec;		ot->exec = add_primitive_plane_exec;
ot->poll = ED_operator_scene_editable;		ot->poll = ED_operator_scene_editable;

/* flags */		/* flags */
ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;		ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;

ED_object_add_unit_props(ot);		ED_object_add_unit_props(ot);
		ED_object_add_mesh_props(ot);
ED_object_add_generic_props(ot, true);		ED_object_add_generic_props(ot, true);
}		}

static int add_primitive_cube_exec(bContext C, wmOperator op)		static int add_primitive_cube_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
bool was_editmode;		bool was_editmode;
unsigned int layer;		unsigned int layer;
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cube"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cube"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs)
		ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_cube matrix=%m4 size=%f",		"create_cube matrix=%m4 size=%f calc_uvs=%b",
mat, RNA_float_get(op->ptr, "radius") * 2.0f))		mat, RNA_float_get(op->ptr, "radius") * 2.0f, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

/* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */		/* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41 makes it unit size) */
make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
Show All 9 Lines	void MESH_OT_primitive_cube_add(wmOperatorType *ot)
/* api callbacks */		/* api callbacks */
ot->exec = add_primitive_cube_exec;		ot->exec = add_primitive_cube_exec;
ot->poll = ED_operator_scene_editable;		ot->poll = ED_operator_scene_editable;

/* flags */		/* flags */
ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;		ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;

ED_object_add_unit_props(ot);		ED_object_add_unit_props(ot);
		ED_object_add_mesh_props(ot);
ED_object_add_generic_props(ot, true);		ED_object_add_generic_props(ot, true);
}		}

static const EnumPropertyItem fill_type_items[] = {		static const EnumPropertyItem fill_type_items[] = {
{0, "NOTHING", 0, "Nothing", "Don't fill at all"},		{0, "NOTHING", 0, "Nothing", "Don't fill at all"},
{1, "NGON", 0, "Ngon", "Use ngons"},		{1, "NGON", 0, "Ngon", "Use ngons"},
{2, "TRIFAN", 0, "Triangle Fan", "Use triangle fans"},		{2, "TRIFAN", 0, "Triangle Fan", "Use triangle fans"},
{0, NULL, 0, NULL, NULL}};		{0, NULL, 0, NULL, NULL}};

static int add_primitive_circle_exec(bContext C, wmOperator op)		static int add_primitive_circle_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
int cap_end, cap_tri;		int cap_end, cap_tri;
unsigned int layer;		unsigned int layer;
bool was_editmode;		bool was_editmode;
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

cap_end = RNA_enum_get(op->ptr, "fill_type");		cap_end = RNA_enum_get(op->ptr, "fill_type");
cap_tri = (cap_end == 2);		cap_tri = (cap_end == 2);

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Circle"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Circle"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs) ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_circle segments=%i diameter=%f cap_ends=%b cap_tris=%b matrix=%m4",		"create_circle segments=%i diameter=%f cap_ends=%b cap_tris=%b matrix=%m4 calc_uvs=%b",
RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius"),		RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius"),
cap_end, cap_tri, mat))		cap_end, cap_tri, mat, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
}		}
Show All 12 Lines	void MESH_OT_primitive_circle_add(wmOperatorType *ot)
/* flags */		/* flags */
ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;		ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;

/* props */		/* props */
RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);		RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
ED_object_add_unit_props(ot);		ED_object_add_unit_props(ot);
RNA_def_enum(ot->srna, "fill_type", fill_type_items, 0, "Fill Type", "");		RNA_def_enum(ot->srna, "fill_type", fill_type_items, 0, "Fill Type", "");

		ED_object_add_mesh_props(ot);
ED_object_add_generic_props(ot, true);		ED_object_add_generic_props(ot, true);
}		}

static int add_primitive_cylinder_exec(bContext C, wmOperator op)		static int add_primitive_cylinder_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
unsigned int layer;		unsigned int layer;
bool was_editmode;		bool was_editmode;
const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");		const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
const bool cap_end = (end_fill_type != 0);		const bool cap_end = (end_fill_type != 0);
const bool cap_tri = (end_fill_type == 2);		const bool cap_tri = (end_fill_type == 2);
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cylinder"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cylinder"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs)
		ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b cap_tris=%b depth=%f matrix=%m4",		"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b cap_tris=%b depth=%f matrix=%m4 calc_uvs=%b",
RNA_int_get(op->ptr, "vertices"),		RNA_int_get(op->ptr, "vertices"),
RNA_float_get(op->ptr, "radius"),		RNA_float_get(op->ptr, "radius"),
RNA_float_get(op->ptr, "radius"),		RNA_float_get(op->ptr, "radius"),
cap_end, cap_tri,		cap_end, cap_tri,
RNA_float_get(op->ptr, "depth"), mat))		RNA_float_get(op->ptr, "depth"), mat, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
}		}
Show All 16 Lines	void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)

/* props */		/* props */
RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);		RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
ED_object_add_unit_props(ot);		ED_object_add_unit_props(ot);
prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);		prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);		RNA_def_property_subtype(prop, PROP_DISTANCE);
RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Cap Fill Type", "");		RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Cap Fill Type", "");

		ED_object_add_mesh_props(ot);
ED_object_add_generic_props(ot, true);		ED_object_add_generic_props(ot, true);
}		}

static int add_primitive_cone_exec(bContext C, wmOperator op)		static int add_primitive_cone_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
unsigned int layer;		unsigned int layer;
bool was_editmode;		bool was_editmode;
const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");		const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type");
const bool cap_end = (end_fill_type != 0);		const bool cap_end = (end_fill_type != 0);
const bool cap_tri = (end_fill_type == 2);		const bool cap_tri = (end_fill_type == 2);
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cone"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cone"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs)
		ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b cap_tris=%b depth=%f matrix=%m4",		"create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b cap_tris=%b depth=%f matrix=%m4 calc_uvs=%b",
RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius1"),		RNA_int_get(op->ptr, "vertices"), RNA_float_get(op->ptr, "radius1"),
RNA_float_get(op->ptr, "radius2"), cap_end, cap_tri, RNA_float_get(op->ptr, "depth"), mat))		RNA_float_get(op->ptr, "radius2"), cap_end, cap_tri, RNA_float_get(op->ptr, "depth"), mat, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
}		}
Show All 19 Lines	void MESH_OT_primitive_cone_add(wmOperatorType *ot)
prop = RNA_def_float(ot->srna, "radius1", 1.0f, 0.0, FLT_MAX, "Radius 1", "", 0.001, 100.00);		prop = RNA_def_float(ot->srna, "radius1", 1.0f, 0.0, FLT_MAX, "Radius 1", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);		RNA_def_property_subtype(prop, PROP_DISTANCE);
prop = RNA_def_float(ot->srna, "radius2", 0.0f, 0.0, FLT_MAX, "Radius 2", "", 0.001, 100.00);		prop = RNA_def_float(ot->srna, "radius2", 0.0f, 0.0, FLT_MAX, "Radius 2", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);		RNA_def_property_subtype(prop, PROP_DISTANCE);
prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);		prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);		RNA_def_property_subtype(prop, PROP_DISTANCE);
RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Base Fill Type", "");		RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Base Fill Type", "");

		ED_object_add_mesh_props(ot);
ED_object_add_generic_props(ot, true);		ED_object_add_generic_props(ot, true);
}		}

static int add_primitive_grid_exec(bContext C, wmOperator op)		static int add_primitive_grid_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
bool was_editmode;		bool was_editmode;
unsigned int layer;		unsigned int layer;
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Grid"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Grid"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs)
		ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_grid x_segments=%i y_segments=%i size=%f matrix=%m4",		"create_grid x_segments=%i y_segments=%i size=%f matrix=%m4 calc_uvs=%b",
RNA_int_get(op->ptr, "x_subdivisions"),		RNA_int_get(op->ptr, "x_subdivisions"),
RNA_int_get(op->ptr, "y_subdivisions"),		RNA_int_get(op->ptr, "y_subdivisions"),
RNA_float_get(op->ptr, "radius"), mat))		RNA_float_get(op->ptr, "radius"), mat, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
}		}
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Lines
static int add_primitive_uvsphere_exec(bContext C, wmOperator op)		static int add_primitive_uvsphere_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
bool was_editmode;		bool was_editmode;
unsigned int layer;		unsigned int layer;
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Sphere"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Sphere"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs)
		ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_uvsphere u_segments=%i v_segments=%i diameter=%f matrix=%m4",		"create_uvsphere u_segments=%i v_segments=%i diameter=%f matrix=%m4 calc_uvs=%b",
RNA_int_get(op->ptr, "segments"), RNA_int_get(op->ptr, "ring_count"),		RNA_int_get(op->ptr, "segments"), RNA_int_get(op->ptr, "ring_count"),
RNA_float_get(op->ptr, "size"), mat))		RNA_float_get(op->ptr, "size"), mat, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
}		}
Show All 15 Lines	void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;		ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;

/* props */		/* props */
RNA_def_int(ot->srna, "segments", 32, 3, INT_MAX, "Segments", "", 3, 500);		RNA_def_int(ot->srna, "segments", 32, 3, INT_MAX, "Segments", "", 3, 500);
RNA_def_int(ot->srna, "ring_count", 16, 3, INT_MAX, "Rings", "", 3, 500);		RNA_def_int(ot->srna, "ring_count", 16, 3, INT_MAX, "Rings", "", 3, 500);
prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00);		prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);		RNA_def_property_subtype(prop, PROP_DISTANCE);

		ED_object_add_mesh_props(ot);
ED_object_add_generic_props(ot, true);		ED_object_add_generic_props(ot, true);
}		}

static int add_primitive_icosphere_exec(bContext C, wmOperator op)		static int add_primitive_icosphere_exec(bContext C, wmOperator op)
{		{
Object *obedit;		Object *obedit;
BMEditMesh *em;		BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;		float loc[3], rot[3], mat[4][4], dia;
bool enter_editmode;		bool enter_editmode;
bool was_editmode;		bool was_editmode;
unsigned int layer;		unsigned int layer;
		const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs");

WM_operator_view3d_unit_defaults(C, op);		WM_operator_view3d_unit_defaults(C, op);
ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);		ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL);
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Icosphere"), &dia, mat, &was_editmode, loc, rot, layer);		obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Icosphere"), &dia, mat, &was_editmode, loc, rot, layer);
em = BKE_editmesh_from_object(obedit);		em = BKE_editmesh_from_object(obedit);

		if (calc_uvs)
		ED_mesh_uv_texture_add(obedit->data, NULL, true);

if (!EDBM_op_call_and_selectf(		if (!EDBM_op_call_and_selectf(
em, op, "verts.out", false,		em, op, "verts.out", false,
"create_icosphere subdivisions=%i diameter=%f matrix=%m4",		"create_icosphere subdivisions=%i diameter=%f matrix=%m4 calc_uvs=%b",
RNA_int_get(op->ptr, "subdivisions"),		RNA_int_get(op->ptr, "subdivisions"),
RNA_float_get(op->ptr, "size"), mat))		RNA_float_get(op->ptr, "size"), mat, calc_uvs))
{		{
return OPERATOR_CANCELLED;		return OPERATOR_CANCELLED;
}		}

make_prim_finish(C, obedit, was_editmode, enter_editmode);		make_prim_finish(C, obedit, was_editmode, enter_editmode);

return OPERATOR_FINISHED;		return OPERATOR_FINISHED;
}		}
Show All 14 Lines	void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
/* flags */		/* flags */
ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;		ot->flag = OPTYPE_REGISTER \| OPTYPE_UNDO;

/* props */		/* props */
RNA_def_int(ot->srna, "subdivisions", 2, 1, INT_MAX, "Subdivisions", "", 1, 8);		RNA_def_int(ot->srna, "subdivisions", 2, 1, INT_MAX, "Subdivisions", "", 1, 8);
prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00);		prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);		RNA_def_property_subtype(prop, PROP_DISTANCE);

		ED_object_add_mesh_props(ot);
ED_object_add_generic_props(ot, true);		ED_object_add_generic_props(ot, true);
}		}