Page MenuHome
Differential D481 Diff 2161 source/blender/editors/mesh/editmesh_add.c

Changeset View

Standalone View

View Options

source/blender/editors/mesh/editmesh_add.c

Context not available.
* \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"
Context not available.
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;
} }
Context not available.
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);
} }
Context not available.
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;
} }
Context not available.
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);
} }
Context not available.
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);
Context not available.
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;
} }
Context not available.
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);
} }
Context not available.
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;
} }
Context not available.
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);
} }
Context not available.
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;
} }
Context not available.
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);
} }
Context not available.
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;
} }
Context not available.
/* props */ /* props */
RNA_def_int(ot->srna, "x_subdivisions", 10, 2, INT_MAX, "X Subdivisions", "", 2, 1000); RNA_def_int(ot->srna, "x_subdivisions", 10, 2, INT_MAX, "X Subdivisions", "", 2, 1000);
RNA_def_int(ot->srna, "y_subdivisions", 10, 2, INT_MAX, "Y Subdivisions", "", 2, 1000); RNA_def_int(ot->srna, "y_subdivisions", 10, 2, INT_MAX, "Y Subdivisions", "", 2, 1000);
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);
} }
Context not available.
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;
} }
Context not available.
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);
} }
Context not available.
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;
} }
Context not available.
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);
} }
Context not available.