sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- adding nurbs sufraces messed up when adding with both editmode and align to view disabled.

Browse Source 
- 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
This commit is contained in:
Campbell Barton 2009-09-12 18:52:26 +00:00
parent 5392a90e28
commit 0fb9380b03
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/curve/editcurve.c
View File

@ -2546,7 +2546,7 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot)
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 @@ Nurb *add_nurbs_primitive(bContext *C, int type, int newname)
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);

2
source/blender/editors/object/object_edit.c
View File

@ -1985,7 +1985,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
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)