← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/curve/editcurve_add.c

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/curve/editcurve_add.c
58
58
 
59
59
#include "curve_intern.h"
60
60
 
61
 
static float nurbcircle[8][2] = {
 
61
static const float nurbcircle[8][2] = {
62
62
        {0.0, -1.0}, {-1.0, -1.0}, {-1.0, 0.0}, {-1.0,  1.0},
63
63
        {0.0,  1.0}, { 1.0,  1.0}, { 1.0, 0.0}, { 1.0, -1.0}
64
64
};
458
458
 
459
459
        if (nu) { /* should always be set */
460
460
                nu->flag |= CU_SMOOTH;
 
461
                cu->actnu = BLI_countlist(editnurb);
 
462
                cu->actvert = CU_ACT_NONE;
461
463
 
462
464
                BKE_nurb_test2D(nu);
463
465
        }
471
473
        ListBase *editnurb;
472
474
        Nurb *nu;
473
475
        bool newob = false;
474
 
        bool enter_editmode, is_view_aligned;
 
476
        bool enter_editmode;
475
477
        unsigned int layer;
476
478
        float dia;
477
479
        float loc[3], rot[3];
479
481
 
480
482
        WM_operator_view3d_unit_defaults(C, op);
481
483
 
482
 
        if (!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode, &layer, &is_view_aligned))
 
484
        if (!ED_object_add_generic_get_opts(C, op, 'Z', loc, rot, &enter_editmode, &layer, NULL))
483
485
                return OPERATOR_CANCELLED;
484
486
 
485
487
        if (!isSurf) { /* adding curve */