diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-15 16:44:36 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 12:13:33 +0300 |
| commit | 05306d97663b4281d4b17bfc7e1ed913ce07966f (patch) | |
| tree | 4c3ed1c62684c317ded5217cf4f40b4589d395dc /intern/cycles/blender | |
| parent | f15c63b0c2216fdebe559a0ed0f93765e6e763dc (diff) | |
SceneRenderLayer > SceneLayer: Convert material_override
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index d18a7f25317..cbe373eff6b 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -409,7 +409,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer) render_layer.layer = get_layer(b_rlay->layers()); render_layer.layer |= render_layer.holdout_layer; - render_layer.material_override = b_rlay->material_override(); + render_layer.material_override = PointerRNA_NULL; render_layer.use_background_shader = b_rlay->use_sky(); render_layer.use_background_ao = b_rlay->use_ao(); render_layer.use_surfaces = b_rlay->use_solid(); diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 0f9cd86bd3c..a0cbc45da98 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -202,7 +202,7 @@ private: uint layer; uint holdout_layer; uint exclude_layer; /* This can be safely removed from Cycles. */ - BL::Material material_override; + BL::Material material_override; /* This can be safely removed from Cycles. */ bool use_background_shader; bool use_background_ao; bool use_surfaces; |