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/curve
parentc4e8d74563e234e6a2cb6ce77f42452b5577fe38 (diff)
more direct fix for last commit
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r--source/blender/editors/curve/editcurve_add.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c
index 4e08ada9738..7c53896b969 100644
--- a/source/blender/editors/curve/editcurve_add.c
+++ b/source/blender/editors/curve/editcurve_add.c
@@ -479,7 +479,7 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
unsigned int layer;
float dia;
float loc[3], rot[3];
- float mat[4][4], scale_mat[4][4];
+ float mat[4][4];
WM_operator_view3d_unit_defaults(C, op);
@@ -531,8 +531,7 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
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);
nu = add_nurbs_primitive(C, obedit, mat, type, newob);
editnurb = object_editcurve_get(obedit);