diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-11 16:49:57 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-11 16:49:57 +0400 |
| commit | 6569ab813f853bc076377220f76868325ffefeb0 (patch) | |
| tree | ec0e1f2db2cb5ebeb3e20946c403186c66a39e60 /intern/cycles | |
| parent | fa3770eb669ab5a1794cc1b9f874c3f0428b487c (diff) | |
Fix for material icon rendering with cycles
Materials icons used to miss transparent background
and were using world environment which didn't give
so nice results.
Reviewed by Brecht, thanks!
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index c3e68e1ae5a..1d2470f6e8a 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -886,7 +886,16 @@ void BlenderSync::sync_world(bool update_all) } PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles"); - background->transparent = get_boolean(cscene, "film_transparent"); + + /* when doing preview render check for BI's transparency settings, + * this is so because bledner's preview render routines are not able + * to tweak all cycles's settings depending on different circumstances + */ + if(b_engine.is_preview() == false) + background->transparent = get_boolean(cscene, "film_transparent"); + else + background->transparent = b_scene.render().alpha_mode() == BL::RenderSettings::alpha_mode_TRANSPARENT; + background->use = render_layer.use_background; if(background->modified(prevbackground)) |