From ccfd67a8d0ea4937593fb3c4eab6ce082b0ca1cb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 Jan 2010 17:50:50 +0000 Subject: [PATCH] missed updating reload scripts --- release/scripts/op/wm.py | 2 +- source/blender/editors/render/render_shading.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/scripts/op/wm.py b/release/scripts/op/wm.py index 4796ec8c97c..95b4cb27288 100644 --- a/release/scripts/op/wm.py +++ b/release/scripts/op/wm.py @@ -411,7 +411,7 @@ class WM_OT_reload_scripts(bpy.types.Operator): def execute(self, context): MOD = type(bpy) - bpy.load_scripts(True) + bpy.utils.load_scripts(True) return {'FINISHED'} diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 413d9889b5d..0ac7fcbeb50 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -795,7 +795,7 @@ static int paste_material_exec(bContext *C, wmOperator *op) Material *ma= CTX_data_pointer_get_type(C, "material", &RNA_Material).data; if(ma==NULL) - return; + return OPERATOR_CANCELLED; paste_matcopybuf(ma);