[Bf-blender-cvs] [f117966c4e2] master: Fix T80395: Cycles baking crash when Surfaces are disabled in the view layer

[Martijn Versteegh]

Commit: f117966c4e2723704c71b1d36978bc0f372ed93c
Author: Martijn Versteegh
Date:   Thu Oct 1 14:28:29 2020 +0200
Branches: master
https://developer.blender.org/rBf117966c4e2723704c71b1d36978bc0f372ed93c

Fix T80395: Cycles baking crash when Surfaces are disabled in the view layer

Always enable surfaces for baking, otherwise there is nothing to bake to.

Differential Revision: https://developer.blender.org/D9015

===================================================================

M	intern/cycles/blender/blender_sync.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index ec62fa63f73..1cdaba57be7 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -422,11 +422,13 @@ void BlenderSync::sync_film(BL::SpaceView3D &b_v3d)
 
 void BlenderSync::sync_view_layer(BL::SpaceView3D & /*b_v3d*/, BL::ViewLayer &b_view_layer)
 {
-  /* render layer */
   view_layer.name = b_view_layer.name();
+
+  /* Filter. */
   view_layer.use_background_shader = b_view_layer.use_sky();
   view_layer.use_background_ao = b_view_layer.use_ao();
-  view_layer.use_surfaces = b_view_layer.use_solid();
+  /* Always enable surfaces for baking, otherwise there is nothing to bake to. */
+  view_layer.use_surfaces = b_view_layer.use_solid() || scene->bake_manager->get_baking();
   view_layer.use_hair = b_view_layer.use_strand();
   view_layer.use_volumes = b_view_layer.use_volumes();