[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25578] trunk/blender: - loading missing files didnt give any warning
Campbell Barton
ideasman42 at gmail.com
Mon Dec 28 00:29:34 CET 2009
Revision: 25578
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25578
Author: campbellbarton
Date: 2009-12-28 00:29:34 +0100 (Mon, 28 Dec 2009)
Log Message:
-----------
- loading missing files didnt give any warning
- shape key transfer poll function
Modified Paths:
--------------
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2009-12-27 20:22:06 UTC (rev 25577)
+++ trunk/blender/release/scripts/op/object.py 2009-12-27 23:29:34 UTC (rev 25578)
@@ -305,6 +305,10 @@
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
Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py 2009-12-27 20:22:06 UTC (rev 25577)
+++ trunk/blender/release/scripts/ui/space_info.py 2009-12-27 23:29:34 UTC (rev 25578)
@@ -150,7 +150,7 @@
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
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2009-12-27 20:22:06 UTC (rev 25577)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2009-12-27 23:29:34 UTC (rev 25578)
@@ -286,8 +286,8 @@
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);
}
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2009-12-27 20:22:06 UTC (rev 25577)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2009-12-27 23:29:34 UTC (rev 25578)
@@ -1160,7 +1160,7 @@
}
}
}
- return 0;
+ return OPERATOR_FINISHED;
}
static int wm_recentfile_invoke(bContext *C, wmOperator *op, wmEvent *event)
More information about the Bf-blender-cvs
mailing list