[Bf-blender-cvs] [285cfef695e] blender2.8: Fixing crash with cycles baking with is_cage and no cage

[Dalai Felinto]

Commit: 285cfef695e18a63eba81a385f9fd82bcbccdabc
Author: Dalai Felinto
Date:   Fri Dec 14 08:27:37 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB285cfef695e18a63eba81a385f9fd82bcbccdabc

Fixing crash with cycles baking with is_cage and no cage

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

M	source/blender/editors/object/object_bake_api.c

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

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 0bff5cb83cb..b3908bd4159 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -56,6 +56,7 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_node.h"
+#include "BKE_object.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
@@ -843,7 +844,8 @@ static int bake(
 				md = md_next;
 			}
 
-			/* get the cage mesh as it arrives in the renderer */
+			/* We need to restore object->data to a non-modifier-evaluated state. */
+			BKE_object_free_derivedderived_caches(ob_low_eval);
 			me_cage = bake_mesh_new_from_object(depsgraph, bmain, scene, ob_low_eval);
 			RE_bake_pixels_populate(me_cage, pixel_array_low, num_pixels, &bake_images, uv_layer);
 		}