[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23156] trunk/blender/source/blender/ editors: - adding nurbs sufraces messed up when adding with both editmode and align to view disabled .

[Campbell Barton]

Revision: 23156
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23156
Author:   campbellbarton
Date:     2009-09-12 20:52:26 +0200 (Sat, 12 Sep 2009)

Log Message:
-----------
- adding nurbs sufraces messed up when adding with both editmode and align to 
view disabled.
- Vkey was being caught by the vertex paint mode, blocking it for curve edit 
where it sets the handle type. Now mode keys pass through if they dont apply to 
the object type.
- set handles had invalid default

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/editors/object/object_edit.c

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c      2009-09-12 
18:23:59 UTC (rev 23155)
+++ trunk/blender/source/blender/editors/curve/editcurve.c      2009-09-12 
18:52:26 UTC (rev 23156)
@@ -2546,7 +2546,7 @@
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
        /* properties */
-       RNA_def_enum(ot->srna, "type", type_items, CU_POLY, "Type", "Spline 
type");
+       RNA_def_enum(ot->srna, "type", type_items, 1, "Type", "Spline type");
 }
 
 /***************** make segment operator **********************/
@@ -4728,7 +4728,7 @@
                cent[2]-= obedit->obmat[3][2];
                
                if(rv3d) {
-                       if (!(newname) || U.flag & USER_ADD_VIEWALIGNED)
+                       if (!newname && U.flag & USER_ADD_VIEWALIGNED)
                                Mat3CpyMat4(imat, rv3d->viewmat);
                        else
                                Mat3One(imat);

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c   2009-09-12 
18:23:59 UTC (rev 23155)
+++ trunk/blender/source/blender/editors/object/object_edit.c   2009-09-12 
18:52:26 UTC (rev 23156)
@@ -1985,7 +1985,7 @@
        int toggle = RNA_boolean_get(op->ptr, "toggle");
 
        if(!ob || !object_mode_set_compat(C, op, ob))
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
 
        /* Exit current mode if it's not the mode we're setting */
        if(ob->mode != OB_MODE_OBJECT && ob->mode != mode)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs