bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Second try at fixing this... the props were still not getting initialised in many cases, but this time because those were using the exec() callbacks which didn't set this. This fix ain't that nice, but at least the old functionality works again like 2.4x.

Browse Source
This commit is contained in:
Joshua Leung 2009-11-04 09:55:24 +00:00
parent de7da7c779
commit b221e57fd2
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/object/object_add.c
View File

@ -334,6 +334,8 @@ static int object_add_curve_exec(bContext *C, wmOperator *op)
Nurb *nu;
int newob= 0, type= RNA_enum_get(op->ptr, "type");
int view_align, enter_editmode;
object_add_generic_invoke_options(C, op); // XXX these props don't get set right when only exec() is called
ED_object_add_generic_get_opts(op, &view_align, &enter_editmode);
if(obedit==NULL || obedit->type!=OB_CURVE) {
@ -417,6 +419,8 @@ static int object_add_surface_exec(bContext *C, wmOperator *op)
Nurb *nu;
int newob= 0;
int view_align, enter_editmode;
object_add_generic_invoke_options(C, op); // XXX these props don't get set right when only exec() is called
ED_object_add_generic_get_opts(op, &view_align, &enter_editmode);
if(obedit==NULL || obedit->type!=OB_SURF) {
@ -476,6 +480,8 @@ static int object_metaball_add_exec(bContext *C, wmOperator *op)
MetaElem *elem;
int newob= 0;
int view_align, enter_editmode;
object_add_generic_invoke_options(C, op); // XXX these props don't get set right when only exec() is called
ED_object_add_generic_get_opts(op, &view_align, &enter_editmode);
if(obedit==NULL || obedit->type!=OB_MBALL) {
@ -540,6 +546,8 @@ static int object_add_text_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
int view_align, enter_editmode;
object_add_generic_invoke_options(C, op); // XXX these props don't get set right when only exec() is called
ED_object_add_generic_get_opts(op, &view_align, &enter_editmode);
if(obedit && obedit->type==OB_FONT)
@ -577,6 +585,8 @@ static int object_armature_add_exec(bContext *C, wmOperator *op)
RegionView3D *rv3d= NULL;
int newob= 0;
int view_align, enter_editmode;
object_add_generic_invoke_options(C, op); // XXX these props don't get set right when only exec() is called
ED_object_add_generic_get_opts(op, &view_align, &enter_editmode);
if ((obedit==NULL) || (obedit->type != OB_ARMATURE)) {