Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/mesh/editmesh_add.c
| Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Lines | static Object *make_prim_init(bContext *C, | ||||
| r_creation_data->was_editmode = false; | r_creation_data->was_editmode = false; | ||||
| if (obedit == NULL || obedit->type != OB_MESH) { | if (obedit == NULL || obedit->type != OB_MESH) { | ||||
| obedit = ED_object_add_type(C, OB_MESH, idname, loc, rot, false, local_view_bits); | obedit = ED_object_add_type(C, OB_MESH, idname, loc, rot, false, local_view_bits); | ||||
| ED_object_editmode_enter_ex(bmain, scene, obedit, 0); | ED_object_editmode_enter_ex(bmain, scene, obedit, 0); | ||||
| r_creation_data->was_editmode = true; | r_creation_data->was_editmode = true; | ||||
| } | } | ||||
| ED_object_new_primitive_matrix(C, obedit, loc, rot, r_creation_data->mat); | ED_object_new_primitive_matrix(C, obedit, loc, rot, scale, r_creation_data->mat); | ||||
| if (scale && !equals_v3v3(scale, (const float[3]){1.0f, 1.0f, 1.0f})) { | |||||
| float scale_half[3]; | |||||
| copy_v3_v3(scale_half, scale); | |||||
| mul_v3_fl(scale_half, 0.5f); | |||||
| rescale_m4(r_creation_data->mat, scale_half); | |||||
| } | |||||
| return obedit; | return obedit; | ||||
| } | } | ||||
| static void make_prim_finish(bContext *C, | static void make_prim_finish(bContext *C, | ||||
| Object *obedit, | Object *obedit, | ||||
| const MakePrimitiveData *creation_data, | const MakePrimitiveData *creation_data, | ||||
| int enter_editmode) | int enter_editmode) | ||||
| ▲ Show 20 Lines • Show All 252 Lines • ▼ Show 20 Lines | static int add_primitive_cylinder_exec(bContext *C, wmOperator *op) | ||||
| if (calc_uvs) { | if (calc_uvs) { | ||||
| ED_mesh_uv_texture_ensure(obedit->data, NULL); | ED_mesh_uv_texture_ensure(obedit->data, NULL); | ||||
| } | } | ||||
| if (!EDBM_op_call_and_selectf(em, | if (!EDBM_op_call_and_selectf(em, | ||||
| op, | op, | ||||
| "verts.out", | "verts.out", | ||||
| false, | false, | ||||
| "create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b " | "create_cone segments=%i radius1=%f radius2=%f cap_ends=%b " | ||||
| "cap_tris=%b depth=%f matrix=%m4 calc_uvs=%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_end, | ||||
| cap_tri, | cap_tri, | ||||
| RNA_float_get(op->ptr, "depth"), | RNA_float_get(op->ptr, "depth"), | ||||
| creation_data.mat, | creation_data.mat, | ||||
| ▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines | static int add_primitive_cone_exec(bContext *C, wmOperator *op) | ||||
| if (calc_uvs) { | if (calc_uvs) { | ||||
| ED_mesh_uv_texture_ensure(obedit->data, NULL); | ED_mesh_uv_texture_ensure(obedit->data, NULL); | ||||
| } | } | ||||
| if (!EDBM_op_call_and_selectf(em, | if (!EDBM_op_call_and_selectf(em, | ||||
| op, | op, | ||||
| "verts.out", | "verts.out", | ||||
| false, | false, | ||||
| "create_cone segments=%i diameter1=%f diameter2=%f cap_ends=%b " | "create_cone segments=%i radius1=%f radius2=%f cap_ends=%b " | ||||
| "cap_tris=%b depth=%f matrix=%m4 calc_uvs=%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, "radius1"), | RNA_float_get(op->ptr, "radius1"), | ||||
| RNA_float_get(op->ptr, "radius2"), | RNA_float_get(op->ptr, "radius2"), | ||||
| cap_end, | cap_end, | ||||
| cap_tri, | cap_tri, | ||||
| RNA_float_get(op->ptr, "depth"), | RNA_float_get(op->ptr, "depth"), | ||||
| creation_data.mat, | creation_data.mat, | ||||
| ▲ Show 20 Lines • Show All 198 Lines • ▼ Show 20 Lines | if (calc_uvs) { | ||||
| ED_mesh_uv_texture_ensure(obedit->data, NULL); | ED_mesh_uv_texture_ensure(obedit->data, NULL); | ||||
| } | } | ||||
| if (!EDBM_op_call_and_selectf( | if (!EDBM_op_call_and_selectf( | ||||
| em, | em, | ||||
| op, | op, | ||||
| "verts.out", | "verts.out", | ||||
| false, | false, | ||||
| "create_uvsphere u_segments=%i v_segments=%i diameter=%f matrix=%m4 calc_uvs=%b", | "create_uvsphere u_segments=%i v_segments=%i radius=%f matrix=%m4 calc_uvs=%b", | ||||
| RNA_int_get(op->ptr, "segments"), | RNA_int_get(op->ptr, "segments"), | ||||
| RNA_int_get(op->ptr, "ring_count"), | RNA_int_get(op->ptr, "ring_count"), | ||||
| RNA_float_get(op->ptr, "radius"), | RNA_float_get(op->ptr, "radius"), | ||||
| creation_data.mat, | creation_data.mat, | ||||
| calc_uvs)) { | calc_uvs)) { | ||||
| return OPERATOR_CANCELLED; | return OPERATOR_CANCELLED; | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines | if (calc_uvs) { | ||||
| ED_mesh_uv_texture_ensure(obedit->data, NULL); | ED_mesh_uv_texture_ensure(obedit->data, NULL); | ||||
| } | } | ||||
| if (!EDBM_op_call_and_selectf( | if (!EDBM_op_call_and_selectf( | ||||
| em, | em, | ||||
| op, | op, | ||||
| "verts.out", | "verts.out", | ||||
| false, | false, | ||||
| "create_icosphere subdivisions=%i diameter=%f matrix=%m4 calc_uvs=%b", | "create_icosphere subdivisions=%i radius=%f matrix=%m4 calc_uvs=%b", | ||||
| RNA_int_get(op->ptr, "subdivisions"), | RNA_int_get(op->ptr, "subdivisions"), | ||||
| RNA_float_get(op->ptr, "radius"), | RNA_float_get(op->ptr, "radius"), | ||||
| creation_data.mat, | creation_data.mat, | ||||
| calc_uvs)) { | calc_uvs)) { | ||||
| return OPERATOR_CANCELLED; | return OPERATOR_CANCELLED; | ||||
| } | } | ||||
| make_prim_finish(C, obedit, &creation_data, enter_editmode); | make_prim_finish(C, obedit, &creation_data, enter_editmode); | ||||
| Show All 25 Lines | |||||