Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for crash with textbox add poll function, missing NULL check.

Browse Source
This commit is contained in:
Campbell Barton
2011-03-15 08:38:08 +00:00
parent b65a56ccb5
commit 2bd375dd52
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/curve/editfont.c
View File

@@ -1373,16 +1373,6 @@ void FONT_OT_text_insert(wmOperatorType *ot)
/*********************** textbox add operator *************************/
static int textbox_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
if (!ED_operator_object_active_editable(C) ) return 0;
if (ob->type != OB_FONT) return 0;
return 1;
}
static int textbox_add_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *obedit= CTX_data_active_object(C);
@@ -1409,8 +1399,8 @@ void FONT_OT_textbox_add(wmOperatorType *ot)
/* api callbacks */
ot->exec= textbox_add_exec;
ot->poll= textbox_poll;
ot->poll= ED_operator_object_active_editable_font;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1452,7 +1442,7 @@ void FONT_OT_textbox_remove(wmOperatorType *ot)
/* api callbacks */
ot->exec= textbox_remove_exec;
ot->poll= textbox_poll;
ot->poll= ED_operator_object_active_editable_font;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;

1
source/blender/editors/include/ED_screen.h
View File

@@ -154,6 +154,7 @@ int ED_operator_console_active(struct bContext *C);
int ED_operator_object_active(struct bContext *C);
int ED_operator_object_active_editable(struct bContext *C);
int ED_operator_object_active_editable_mesh(struct bContext *C);
int ED_operator_object_active_editable_font(struct bContext *C);
int ED_operator_editmesh(struct bContext *C);
int ED_operator_editmesh_view3d(struct bContext *C);
int ED_operator_editmesh_region_view3d(struct bContext *C);

6
source/blender/editors/screen/screen_ops.c
View File

@@ -282,6 +282,12 @@ int ED_operator_object_active_editable_mesh(bContext *C)
return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag & OB_RESTRICT_VIEW) && ob->type == OB_MESH);
}
int ED_operator_object_active_editable_font(bContext *C)
{
Object *ob = ED_object_active_context(C);
return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag & OB_RESTRICT_VIEW) && ob->type == OB_FONT);
}
int ED_operator_editmesh(bContext *C)
{
Object *obedit= CTX_data_edit_object(C);