Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-01-28 20:50:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-01-28 20:50:50 +0300
commitccfd67a8d0ea4937593fb3c4eab6ce082b0ca1cb (patch)
tree68659cb976d89ebd66a5af918f70b2277a5eb869 /source/blender/editors/render/render_shading.c
parent6f4a26c9e0e078f3d801f425de70853ea4ee7536 (diff)
missed updating reload scripts
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
-rw-r--r--source/blender/editors/render/render_shading.c2
1 files changed, 1 insertions, 1 deletions
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);