[Bf-blender-cvs] [85d845ef98b] blender2.8: Fix crash when moving object parented to a curve

[Dalai Felinto]

Commit: 85d845ef98bfa612f253c8580ceb00d6ce5b443a
Author: Dalai Felinto
Date:   Tue May 29 16:17:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB85d845ef98bfa612f253c8580ceb00d6ce5b443a

Fix crash when moving object parented to a curve

Note, we can probably remove scene from BKE_object_where_is_calc
and force to always use it from depsgraph.

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

M	source/blender/editors/transform/transform_conversions.c

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

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 49ac60df315..b23caea7fb7 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -5676,13 +5676,15 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
 	if (t->mode == TFM_DUMMY)
 		skip_invert = true;
 
+	Scene *scene_eval = DEG_get_evaluated_scene(t->depsgraph);
 	if (skip_invert == false && constinv == false) {
-		ob->transflag |= OB_NO_CONSTRAINTS;  /* BKE_object_where_is_calc_time checks this */
-		BKE_object_where_is_calc(t->depsgraph, t->scene, ob);
-		ob->transflag &= ~OB_NO_CONSTRAINTS;
+		ob_eval->transflag |= OB_NO_CONSTRAINTS;  /* BKE_object_where_is_calc_time checks this */
+		BKE_object_where_is_calc(t->depsgraph, scene_eval, ob_eval);
+		ob_eval->transflag &= ~OB_NO_CONSTRAINTS;
+	}
+	else {
+		BKE_object_where_is_calc(t->depsgraph, scene_eval, ob_eval);
 	}
-	else
-		BKE_object_where_is_calc(t->depsgraph, t->scene, ob);
 
 	td->ob = ob;