diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-04 16:08:57 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-04 17:11:27 +0300 |
commit | fc115e1ab23a9c458ea1496f160e14009e68cd54 (patch) | |
tree | f61d7a4d8c09d5ebf6839299ec00998976f31f3f /source/blender/editors/mesh/editmesh_add.c | |
parent | 0f50caf5560f9c2f9af393eefdf2b209210dbfba (diff) |
Cleanup: remove legacy layer and dupli code.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 66ad057e3ec..b2f0ecc55c6 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -67,14 +67,14 @@ typedef struct MakePrimitiveData { static Object *make_prim_init( bContext *C, const char *idname, - const float loc[3], const float rot[3], const unsigned int layer, + const float loc[3], const float rot[3], MakePrimitiveData *r_creation_data) { Object *obedit = CTX_data_edit_object(C); r_creation_data->was_editmode = false; if (obedit == NULL || obedit->type != OB_MESH) { - obedit = ED_object_add_type(C, OB_MESH, idname, loc, rot, false, layer); + obedit = ED_object_add_type(C, OB_MESH, idname, loc, rot, false); /* create editmode */ ED_object_editmode_enter(C, EM_IGNORE_LAYER); /* rare cases the active layer is messed up */ @@ -112,12 +112,11 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op) BMEditMesh *em; float loc[3], rot[3]; bool enter_editmode; - unsigned int layer; const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs"); WM_operator_view3d_unit_defaults(C, op); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Plane"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Plane"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { @@ -163,12 +162,11 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op) BMEditMesh *em; float loc[3], rot[3]; bool enter_editmode; - unsigned int layer; const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs"); WM_operator_view3d_unit_defaults(C, op); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cube"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cube"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { @@ -222,15 +220,14 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op) float loc[3], rot[3]; bool enter_editmode; int cap_end, cap_tri; - unsigned int layer; const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs"); cap_end = RNA_enum_get(op->ptr, "fill_type"); cap_tri = (cap_end == 2); WM_operator_view3d_unit_defaults(C, op); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Circle"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Circle"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { @@ -281,15 +278,14 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op) BMEditMesh *em; float loc[3], rot[3]; bool enter_editmode; - unsigned int layer; const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type"); const bool cap_end = (end_fill_type != 0); 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); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cylinder"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cylinder"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { @@ -344,15 +340,14 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op) BMEditMesh *em; float loc[3], rot[3]; bool enter_editmode; - unsigned int layer; const int end_fill_type = RNA_enum_get(op->ptr, "end_fill_type"); const bool cap_end = (end_fill_type != 0); 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); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cone"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cone"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { @@ -406,12 +401,11 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op) BMEditMesh *em; float loc[3], rot[3]; bool enter_editmode; - unsigned int layer; const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs"); WM_operator_view3d_unit_defaults(C, op); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Grid"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Grid"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { @@ -466,13 +460,12 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op) float loc[3], rot[3]; float dia; bool enter_editmode; - unsigned int layer; const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs"); WM_operator_view3d_unit_defaults(C, op); - ED_object_add_generic_get_opts(C, op, 'Y', loc, rot, &enter_editmode, &layer, NULL); + ED_object_add_generic_get_opts(C, op, 'Y', loc, rot, &enter_editmode, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Suzanne"), loc, rot, layer, &creation_data); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Suzanne"), loc, rot, &creation_data); dia = RNA_float_get(op->ptr, "radius"); mul_mat3_m4_fl(creation_data.mat, dia); @@ -521,12 +514,11 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op) BMEditMesh *em; float loc[3], rot[3]; bool enter_editmode; - unsigned int layer; const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs"); WM_operator_view3d_unit_defaults(C, op); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Sphere"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Sphere"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { @@ -577,12 +569,11 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op) BMEditMesh *em; float loc[3], rot[3]; bool enter_editmode; - unsigned int layer; const bool calc_uvs = RNA_boolean_get(op->ptr, "calc_uvs"); WM_operator_view3d_unit_defaults(C, op); - ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL); - obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Icosphere"), loc, rot, layer, &creation_data); + ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, NULL); + obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Icosphere"), loc, rot, &creation_data); em = BKE_editmesh_from_object(obedit); if (calc_uvs) { |