Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-02-09 19:00:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-02-09 19:00:37 +0300
commit2fe9e3c1f0fd968bb214e13763b58a35f637caa9 (patch)
tree3997f3c43c3cc15c537ef67529d7eebe158ac4b8 /source/blender/editors/mesh/editmesh_add.c
parentc4e8d74563e234e6a2cb6ce77f42452b5577fe38 (diff)
more direct fix for last commit
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
-rw-r--r--source/blender/editors/mesh/editmesh_add.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index a2160df1e63..6ce5e8a304b 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -422,7 +422,7 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
{
Object *obedit;
BMEditMesh *em;
- float mat[4][4], scale_mat[4][4];
+ float mat[4][4];
float loc[3], rot[3];
float dia;
bool enter_editmode;
@@ -434,8 +434,7 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Suzanne"), &dia, mat, &was_editmode, loc, rot, layer);
dia = RNA_float_get(op->ptr, "radius");
- scale_m4_fl(scale_mat, dia);
- mul_m4_m4m4(mat, scale_mat, mat);
+ mul_mat3_m4_fl(mat, dia);
em = BKE_editmesh_from_object(obedit);