diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-20 00:40:54 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-20 00:40:54 +0400 |
| commit | e6fc17415223d97a5a8c8bca0af443fb3a655699 (patch) | |
| tree | 8696c810b22464262db029f55e937782cd64cc7b /intern/cycles/blender/blender_shader.cpp | |
| parent | ac4058a2117a24901f2462ba34d49e6714532148 (diff) | |
| parent | 93af050824170913d716e42e918ab58c224ed7f1 (diff) | |
Merged revision(s) 57499-57586 from trunk/blender into soc-2013-dingto
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index f2671185301..ee6a0887d45 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -863,7 +863,8 @@ void BlenderSync::sync_materials(bool update_all) /* settings */ PointerRNA cmat = RNA_pointer_get(&b_mat->ptr, "cycles"); - shader->sample_as_light = get_boolean(cmat, "sample_as_light"); + shader->use_mis = get_boolean(cmat, "sample_as_light"); + shader->use_transparent_shadow = get_boolean(cmat, "use_transparent_shadow"); shader->homogeneous_volume = get_boolean(cmat, "homogeneous_volume"); shader->set_graph(graph); |