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 22:18:35 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-01-28 22:18:35 +0300
commitcd2c4a58345dfabf88e985b6aca5f259168f628e (patch)
tree579d9f44960853a5f55a7e0e05c27d2059c6f760 /source/blender/editors/render
parentabde08b71672d67511309a18aa80c9c278a7c313 (diff)
- change max threads from 8 to 64, need to keep an eye on stack memory use here.
- reload fix didnt work last commit.
Diffstat (limited to 'source/blender/editors/render')
-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 0ac7fcbeb50..4874879a31e 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -767,7 +767,7 @@ static int copy_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;
copy_matcopybuf(ma);