Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / transform / transform_conversions.c
index d2c48c4aea00a03df600a04d4a423a1f87186815..5e8c2e2c09acd7e6bf4db049b86b47a561a7b906 100644 (file)
@@ -1890,7 +1890,6 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
 {
        TransData *td = NULL;
        TransDataExtension *tx;
-       Base *base = CTX_data_active_base(C);
        Object *ob = CTX_data_active_object(C);
        ParticleEditSettings *pset = PE_settings(t->scene);
        PTCacheEdit *edit = PE_get_current(t->scene, t->view_layer, ob);
@@ -1910,8 +1909,6 @@ static void createTransParticleVerts(bContext *C, TransInfo *t)
        if (psys)
                psmd = psys_get_modifier(ob, psys);
 
-       base->flag |= BA_HAS_RECALC_DATA;
-
        for (i = 0, point = edit->points; i < edit->totpoint; i++, point++) {
                point->flag &= ~PEP_TRANSFORM;
                transformparticle = 0;
@@ -5612,10 +5609,9 @@ static void set_trans_object_base_flags(TransInfo *t)
        /* and we store them temporal in base (only used for transform code) */
        /* 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)
-                       base->flag_legacy |= BA_HAS_RECALC_OB;
-               if (base->object->recalc & OB_RECALC_DATA)
-                       base->flag_legacy |= BA_HAS_RECALC_DATA;
+               if (base->object->recalc & (OB_RECALC_OB | OB_RECALC_DATA)) {
+                       base->flag |= BA_SNAP_FIX_DEPS_FIASCO;
+               }
        }
 }
 
@@ -5696,10 +5692,9 @@ static int count_proportional_objects(TransInfo *t)
        /* and we store them temporal in base (only used for transform code) */
        /* 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)
-                       base->flag_legacy |= BA_HAS_RECALC_OB;
-               if (base->object->recalc & OB_RECALC_DATA)
-                       base->flag_legacy |= BA_HAS_RECALC_DATA;
+               if (base->object->recalc & (OB_RECALC_OB | OB_RECALC_DATA)) {
+                       base->flag |= BA_SNAP_FIX_DEPS_FIASCO;
+               }
        }
 
        return total;
@@ -5715,7 +5710,7 @@ static void clear_trans_object_base_flags(TransInfo *t)
                        base->flag |= BASE_SELECTED;
                }
 
-               base->flag_legacy &= ~(BA_WAS_SEL | BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA | BA_TEMP_TAG | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT);
+               base->flag_legacy &= ~(BA_WAS_SEL | BA_SNAP_FIX_DEPS_FIASCO | BA_TEMP_TAG | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT);
        }
 }