diff options
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 3e355deef33..cb828914735 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5353,7 +5353,7 @@ static void set_trans_object_base_flags(TransInfo *t) * if Base selected and has parent selected: * base->flag = BA_WAS_SEL */ - Base *base; + BaseLegacy *base; /* don't do it if we're not actually going to recalculate anything */ if (t->mode == TFM_DUMMY) @@ -5374,7 +5374,7 @@ static void set_trans_object_base_flags(TransInfo *t) } for (base = scene->base.first; base; base = base->next) { - base->flag &= ~BA_WAS_SEL; + base->flag_legacy &= ~BA_WAS_SEL; if (TESTBASELIB_BGMODE(v3d, scene, base)) { Object *ob = base->object; @@ -5383,7 +5383,7 @@ static void set_trans_object_base_flags(TransInfo *t) /* if parent selected, deselect */ while (parsel) { if (parsel->flag & SELECT) { - Base *parbase = BKE_scene_base_find(scene, parsel); + BaseLegacy *parbase = BKE_scene_base_find(scene, parsel); if (parbase) { /* in rare cases this can fail */ if (TESTBASELIB_BGMODE(v3d, scene, parbase)) { break; @@ -5398,11 +5398,11 @@ static void set_trans_object_base_flags(TransInfo *t) if ((t->around == V3D_AROUND_LOCAL_ORIGINS) && (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL)) { - base->flag |= BA_TRANSFORM_CHILD; + base->flag_legacy |= BA_TRANSFORM_CHILD; } else { - base->flag &= ~SELECT; - base->flag |= BA_WAS_SEL; + base->flag_legacy &= ~SELECT; + base->flag_legacy |= BA_WAS_SEL; } } DAG_id_tag_update(&ob->id, OB_RECALC_OB); @@ -5413,9 +5413,9 @@ static void set_trans_object_base_flags(TransInfo *t) /* this because after doing updates, the object->recalc is cleared */ for (base = scene->base.first; base; base = base->next) { if (base->object->recalc & OB_RECALC_OB) - base->flag |= BA_HAS_RECALC_OB; + base->flag_legacy |= BA_HAS_RECALC_OB; if (base->object->recalc & OB_RECALC_DATA) - base->flag |= BA_HAS_RECALC_DATA; + base->flag_legacy |= BA_HAS_RECALC_DATA; } } @@ -5439,7 +5439,7 @@ static int count_proportional_objects(TransInfo *t) int total = 0; Scene *scene = t->scene; View3D *v3d = t->view; - Base *base; + BaseLegacy *base; /* rotations around local centers are allowed to propagate, so we take all objects */ if (!((t->around == V3D_AROUND_LOCAL_ORIGINS) && @@ -5491,9 +5491,9 @@ static int count_proportional_objects(TransInfo *t) /* this because after doing updates, the object->recalc is cleared */ for (base = scene->base.first; base; base = base->next) { if (base->object->recalc & OB_RECALC_OB) - base->flag |= BA_HAS_RECALC_OB; + base->flag_legacy |= BA_HAS_RECALC_OB; if (base->object->recalc & OB_RECALC_DATA) - base->flag |= BA_HAS_RECALC_DATA; + base->flag_legacy |= BA_HAS_RECALC_DATA; } return total; @@ -5502,13 +5502,13 @@ static int count_proportional_objects(TransInfo *t) static void clear_trans_object_base_flags(TransInfo *t) { Scene *sce = t->scene; - Base *base; + BaseLegacy *base; for (base = sce->base.first; base; base = base->next) { - if (base->flag & BA_WAS_SEL) - base->flag |= SELECT; + if (base->flag_legacy & BA_WAS_SEL) + base->flag_legacy |= SELECT; - base->flag &= ~(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_HAS_RECALC_OB | BA_HAS_RECALC_DATA | BA_TEMP_TAG | BA_TRANSFORM_CHILD | BA_TRANSFORM_PARENT); } } @@ -6426,7 +6426,7 @@ static void createTransObject(bContext *C, TransInfo *t) if (is_prop_edit) { View3D *v3d = t->view; - Base *base; + BaseLegacy *base; for (base = scene->base.first; base; base = base->next) { Object *ob = base->object; @@ -8040,7 +8040,7 @@ void createTransData(bContext *C, TransInfo *t) * lines below just check is also visible */ Object *ob_armature = modifiers_isDeformedByArmature(ob); if (ob_armature && ob_armature->mode & OB_MODE_POSE) { - Base *base_arm = BKE_scene_base_find(t->scene, ob_armature); + BaseLegacy *base_arm = BKE_scene_base_find(t->scene, ob_armature); if (base_arm) { View3D *v3d = t->view; if (BASE_VISIBLE(v3d, base_arm)) { |