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

2.5 - Bugfixes

Browse Source 
* Fix for crash when holding down downarrow in the info-header search box. Was caused by badly written poll callback for file-browser. Thanks pidhash for noticing the error

* Made add constraint operators work again from 3D-View. They were using the wrong context pointer when in the 3D-View, since the old one was only valid for the buttons-window. Now they check which window they're in.
This commit is contained in:
Joshua Leung 2009-07-20 00:02:03 +00:00
parent 4e9171e6f6
commit b76009232e
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/object/editconstraint.c
View File

@ -1329,8 +1329,14 @@ static int object_constraint_add_invoke(bContext *C, wmOperator *op, wmEvent *ev
/* dummy operator callback */ /* dummy operator callback */
static int object_constraint_add_exec(bContext *C, wmOperator *op) static int object_constraint_add_exec(bContext *C, wmOperator *op)
{ {
Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data; ScrArea *sa= CTX_wm_area(C);
Object *ob;
if (sa->spacetype == SPACE_BUTS)
ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
else
ob= CTX_data_active_object(C);
if (!ob) if (!ob)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
@ -1372,8 +1378,14 @@ static int pose_constraint_add_invoke(bContext *C, wmOperator *op, wmEvent *evt)
/* dummy operator callback */ /* dummy operator callback */
static int pose_constraint_add_exec(bContext *C, wmOperator *op) static int pose_constraint_add_exec(bContext *C, wmOperator *op)
{ {
Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data; ScrArea *sa= CTX_wm_area(C);
Object *ob;
if (sa->spacetype == SPACE_BUTS)
ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
else
ob= CTX_data_active_object(C);
if (!ob) if (!ob)
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;

17
source/blender/editors/space_file/file_ops.c
View File

@ -876,14 +876,17 @@ int file_delete_poll(bContext *C)
SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C); SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C);
struct direntry* file; struct direntry* file;
if(!sfile->params ) poll= 0; if (sfile->params) {
if (sfile->params->active_file < 0) {
if (sfile->params->active_file < 0) { poll= 0;
poll= 0; } else {
} else { file = filelist_file(sfile->files, sfile->params->active_file);
file = filelist_file(sfile->files, sfile->params->active_file); if (file && S_ISDIR(file->type)) poll= 0;
if (file && S_ISDIR(file->type)) poll= 0; }
} }
else
poll= 0;
return poll; return poll;
} }