diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 18:36:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 18:36:24 +0300 |
| commit | f3de312b83477d5153eead472d68b7650c0f2b16 (patch) | |
| tree | c7004ca7e071bf30fcc272afebd027e576d91717 /source/blender | |
| parent | a989913dd4c777ac936671ab214144429087e4ad (diff) | |
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???
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } } |