[Bf-blender-cvs] [48fcadc] master: Fix T40214: Wrong size calculation on new curve objects
Bastien Montagne
noreply at git.blender.org
Thu May 15 22:11:03 CEST 2014
Commit: 48fcadc88d1a958e8bfc13871d23addfa1514d61
Author: Bastien Montagne
Date: Thu May 15 22:08:27 2014 +0200
https://developer.blender.org/rB48fcadc88d1a958e8bfc13871d23addfa1514d61
Fix T40214: Wrong size calculation on new curve objects
Do not take into account grid size in objectdata creation itself, this is handled on a higher level.
===================================================================
M source/blender/editors/curve/editcurve_add.c
===================================================================
diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c
index c2a7a50..1cd690c 100644
--- a/source/blender/editors/curve/editcurve_add.c
+++ b/source/blender/editors/curve/editcurve_add.c
@@ -109,7 +109,6 @@ Nurb *add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type
{
static int xzproj = 0; /* this function calls itself... */
ListBase *editnurb = object_editcurve_get(obedit);
- View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = ED_view3d_context_rv3d(C);
Nurb *nu = NULL;
BezTriple *bezt;
@@ -119,7 +118,7 @@ Nurb *add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type
float umat[4][4] = MAT4_UNITY, viewmat[4][4] = MAT4_UNITY;
float fac;
int a, b;
- const float grid = v3d ? v3d->grid : 1.0f;
+ const float grid = 1.0f;
const int cutype = (type & CU_TYPE); // poly, bezier, nurbs, etc
const int stype = (type & CU_PRIMITIVE);
const int force_3d = ((Curve *)obedit->data)->flag & CU_3D; /* could be adding to an existing 3D curve */
More information about the Bf-blender-cvs
mailing list