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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-14 20:01:34 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-14 20:01:34 +0400
commita47af30561ea9b0b2933a4af202a560b3576ee11 (patch)
treef0423667b8faf2b7e13cfff37efd88f47c2bf620
parent59a2ed19df86bcb60034af693ee8909ddc57c081 (diff)
Fix #34240: cycles material preview of sphere + sky had black sky, now it uses
the current scene world.
-rw-r--r--source/blender/editors/render/render_preview.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 80dcb93a7a2..33b00cbf2ea 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -360,7 +360,11 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre
}
}
}
-
+ else {
+ /* use current scene world to light sphere */
+ if (ma->pr_type == MA_SPHERE_A)
+ sce->world = scene->world;
+ }
if (sp->pr_method == PR_ICON_RENDER) {
if (mat->material_type == MA_TYPE_HALO) {