diff options
| -rw-r--r-- | release/scripts/op/object.py | 4 | ||||
| -rw-r--r-- | release/scripts/ui/space_info.py | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py index c510981ebc2..e093460ab31 100644 --- a/release/scripts/op/object.py +++ b/release/scripts/op/object.py @@ -305,6 +305,10 @@ class ShapeTransfer(bpy.types.Operator): return {'FINISHED'} + def poll(self, context): + obj = context.active_object + return (obj and obj.mode != 'EDIT') + def execute(self, context): C = bpy.context ob_act = C.active_object diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index 3f35bbc06d8..92bf6dc36a7 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -150,7 +150,7 @@ class INFO_MT_file_external_data(bpy.types.Menu): class INFO_MT_mesh_add(bpy.types.Menu): bl_idname = "INFO_MT_mesh_add" - bl_label = "Mesh" + bl_label = "Add Mesh" def draw(self, context): layout = self.layout diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 87e4048971b..05fdb500d9e 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -286,8 +286,8 @@ void WM_read_file(bContext *C, char *name, ReportList *reports) else if(retval==1) BKE_write_undo(C, "Import file"); else if(retval == -1) { - if(reports && reports->list.first == NULL) - BKE_report(reports, RPT_ERROR, "Cannot read file."); + if(reports) + BKE_reportf(reports, RPT_ERROR, "Can't read file \"%s\".", name); } } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 69d6ef541dc..db79fcd70b9 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1160,7 +1160,7 @@ static int recentfile_exec(bContext *C, wmOperator *op) } } } - return 0; + return OPERATOR_FINISHED; } static int wm_recentfile_invoke(bContext *C, wmOperator *op, wmEvent *event) |