[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26372] trunk/blender: missed updating reload scripts
Campbell Barton
ideasman42 at gmail.com
Thu Jan 28 18:50:50 CET 2010
Revision: 26372
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26372
Author: campbellbarton
Date: 2010-01-28 18:50:50 +0100 (Thu, 28 Jan 2010)
Log Message:
-----------
missed updating reload scripts
Modified Paths:
--------------
trunk/blender/release/scripts/op/wm.py
trunk/blender/source/blender/editors/render/render_shading.c
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2010-01-28 17:31:11 UTC (rev 26371)
+++ trunk/blender/release/scripts/op/wm.py 2010-01-28 17:50:50 UTC (rev 26372)
@@ -411,7 +411,7 @@
def execute(self, context):
MOD = type(bpy)
- bpy.load_scripts(True)
+ bpy.utils.load_scripts(True)
return {'FINISHED'}
Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c 2010-01-28 17:31:11 UTC (rev 26371)
+++ trunk/blender/source/blender/editors/render/render_shading.c 2010-01-28 17:50:50 UTC (rev 26372)
@@ -795,7 +795,7 @@
Material *ma= CTX_data_pointer_get_type(C, "material", &RNA_Material).data;
if(ma==NULL)
- return;
+ return OPERATOR_CANCELLED;
paste_matcopybuf(ma);
More information about the Bf-blender-cvs
mailing list