[Bf-blender-cvs] [f3de312b834] blender2.8: Transform: Fix recent merge conflict resolution fiasco

[Sergey Sharybin]

Commit: f3de312b83477d5153eead472d68b7650c0f2b16
Author: Sergey Sharybin
Date:   Thu Nov 30 16:36:24 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBf3de312b83477d5153eead472d68b7650c0f2b16

Transform: Fix recent merge conflict resolution fiasco

Why is it called legacy when this is a legit flags which are still to be checked
at a runtime???

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

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 5e8c2e2c09a..b59c6a70475 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -5610,7 +5610,7 @@ static void set_trans_object_base_flags(TransInfo *t)
 	/* this because after doing updates, the object->recalc is cleared */
 	for (base = view_layer->object_bases.first; base; base = base->next) {
 		if (base->object->recalc & (OB_RECALC_OB | OB_RECALC_DATA)) {
-			base->flag |= BA_SNAP_FIX_DEPS_FIASCO;
+			base->flag_legacy |= BA_SNAP_FIX_DEPS_FIASCO;
 		}
 	}
 }
@@ -5693,7 +5693,7 @@ static int count_proportional_objects(TransInfo *t)
 	/* this because after doing updates, the object->recalc is cleared */
 	for (base = view_layer->object_bases.first; base; base = base->next) {
 		if (base->object->recalc & (OB_RECALC_OB | OB_RECALC_DATA)) {
-			base->flag |= BA_SNAP_FIX_DEPS_FIASCO;
+			base->flag_legacy |= BA_SNAP_FIX_DEPS_FIASCO;
 		}
 	}