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>2012-02-06 02:13:10 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-06 02:13:10 +0400
commit3937ec7d11996438c2c6bd65d1d88f72431b1d52 (patch)
treee0a2104d51f1a44de88047a0e9d17d8492b343b1 /source/blender/editors/curve
parent11d5a2d2eba127e2f8502e570addb08c22cbb9c1 (diff)
parent8f3170a17c270dd8a02f9b3bf2a971a65cab67ae (diff)
svn merge ^/trunk/blender -r43887:43918
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r--source/blender/editors/curve/editcurve.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 4565806702f..495c8a8f842 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -3389,8 +3389,12 @@ static int convertspline(short type, Nurb *nu)
nu->orderu= 4;
nu->orderv= 1;
nu->type = type;
+
+#if 0 /* UNUSED */
if(nu->flagu & CU_NURB_CYCLIC) c= nu->orderu-1;
else c= 0;
+#endif
+
if(type== CU_NURBS) {
nu->flagu &= CU_NURB_CYCLIC; /* disable all flags except for cyclic */
nu->flagu |= CU_NURB_BEZIER;