From 285cfef695e18a63eba81a385f9fd82bcbccdabc Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 14 Dec 2018 08:27:37 -0200 Subject: Fixing crash with cycles baking with is_cage and no cage --- source/blender/editors/object/object_bake_api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender') 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); } -- cgit v1.2.3