kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix generate UV's adding extra layers

Browse Source 
Adding a new meshes when there were no faces would always add a new uv-layer.
This commit is contained in:
Campbell Barton 2015-12-06 11:17:17 +11:00
parent ed5dbb0a7b
commit 8f12dad309
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/editors/mesh/editmesh_add.c
View File

@ -114,8 +114,8 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Plane"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
@ -165,8 +165,8 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cube"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
@ -227,8 +227,8 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Circle"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
@ -286,8 +286,8 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cylinder"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
@ -349,8 +349,8 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Cone"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
@ -407,8 +407,8 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Grid"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
@ -516,8 +516,8 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Sphere"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(
@ -572,8 +572,8 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLT_I18NCONTEXT_ID_MESH, "Icosphere"), &dia, mat, &was_editmode, loc, rot, layer); obedit = make_prim_init(C, CTX_DATA_(BLT_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_uvedit_test(obedit)) { if (calc_uvs) {
ED_mesh_uv_texture_add(obedit->data, NULL, true); ED_mesh_uv_texture_ensure(obedit->data, NULL);
} }
if (!EDBM_op_call_and_selectf( if (!EDBM_op_call_and_selectf(