[Bf-blender-cvs] [b6542f71e12] master: Cleanup/Refactor: Unify similar flags

[Germano Cavalcante]

Commit: b6542f71e12265547a0b5684335d2d27f5e48c1f
Author: Germano Cavalcante
Date:   Sat Apr 24 11:24:53 2021 -0300
Branches: master
https://developer.blender.org/rBb6542f71e12265547a0b5684335d2d27f5e48c1f

Cleanup/Refactor: Unify similar flags

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

M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_convert.c
M	source/blender/editors/transform/transform_convert_mesh.c
M	source/blender/editors/transform/transform_convert_mesh_skin.c
M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index f2d5800abb7..861243bda2c 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -88,12 +88,11 @@ typedef enum {
   CTX_TEXTURE_SPACE = (1 << 9),
 
   CTX_NO_PET = (1 << 10),
-  CTX_NO_MIRROR = (1 << 11),
-  CTX_AUTOCONFIRM = (1 << 12),
+  CTX_AUTOCONFIRM = (1 << 11),
   /** When transforming object's, adjust the object data so it stays in the same place. */
-  CTX_OBMODE_XFORM_OBDATA = (1 << 13),
+  CTX_OBMODE_XFORM_OBDATA = (1 << 12),
   /** Transform object parents without moving their children. */
-  CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 14),
+  CTX_OBMODE_XFORM_SKIP_CHILDREN = (1 << 13),
 } eTContext;
 
 /** #TransInfo.flag */
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index 7095e52452c..98db27c83f7 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -1122,8 +1122,7 @@ static void init_TransDataContainers(TransInfo *t,
 
     for (int i = 0; i < objects_len; i++) {
       TransDataContainer *tc = &t->data_container[i];
-      if (((t->flag & T_NO_MIRROR) == 0) && ((t->options & CTX_NO_MIRROR) == 0) &&
-          (objects[i]->type == OB_MESH)) {
+      if (!(t->flag & T_NO_MIRROR) && (objects[i]->type == OB_MESH)) {
         tc->use_mirror_axis_x = (((Mesh *)objects[i]->data)->symmetry & ME_SYMMETRY_X) != 0;
         tc->use_mirror_axis_y = (((Mesh *)objects[i]->data)->symmetry & ME_SYMMETRY_Y) != 0;
         tc->use_mirror_axis_z = (((Mesh *)objects[i]->data)->symmetry & ME_SYMMETRY_Z) != 0;
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index 74be1ffb04f..872f3e1385a 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -1624,7 +1624,7 @@ void recalcData_mesh(TransInfo *t)
   if (!is_canceling) {
     applyProject(t);
 
-    bool do_mirror = !(t->flag & T_NO_MIRROR) && !(t->options & CTX_NO_MIRROR);
+    bool do_mirror = !(t->flag & T_NO_MIRROR);
     FOREACH_TRANS_DATA_CONTAINER (t, tc) {
       /* Apply clipping after so we never project past the clip plane T25423. */
       transform_convert_clip_mirror_modifier_apply(tc);
diff --git a/source/blender/editors/transform/transform_convert_mesh_skin.c b/source/blender/editors/transform/transform_convert_mesh_skin.c
index 5045e18a02e..68305c45280 100644
--- a/source/blender/editors/transform/transform_convert_mesh_skin.c
+++ b/source/blender/editors/transform/transform_convert_mesh_skin.c
@@ -48,8 +48,8 @@
  * \{ */
 
 static float *tc_mesh_skin_transdata_center(const struct TransIslandData *island_data,
-                                         const int island_index,
-                                         BMVert *eve)
+                                            const int island_index,
+                                            BMVert *eve)
 {
   if (island_data->center && island_index != -1) {
     return island_data->center[island_index];
@@ -58,10 +58,10 @@ static float *tc_mesh_skin_transdata_center(const struct TransIslandData *island
 }
 
 static void tc_mesh_skin_transdata_create(TransDataBasic *td,
-                                       BMEditMesh *em,
-                                       BMVert *eve,
-                                       const struct TransIslandData *island_data,
-                                       const int island_index)
+                                          BMEditMesh *em,
+                                          BMVert *eve,
+                                          const struct TransIslandData *island_data,
+                                          const int island_index)
 {
   BLI_assert(BM_elem_flag_test(eve, BM_ELEM_HIDDEN) == 0);
   MVertSkin *vs = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MVERT_SKIN);
@@ -292,7 +292,7 @@ void recalcData_mesh_skin(TransInfo *t)
   bool is_canceling = t->state == TRANS_CANCEL;
   /* mirror modifier clipping? */
   if (!is_canceling) {
-    if ((t->flag & T_NO_MIRROR) == 0 && (t->options & CTX_NO_MIRROR) == 0) {
+    if (!(t->flag & T_NO_MIRROR)) {
       tc_mesh_skin_apply_to_mirror(t);
     }
   }
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index c0c4b22da98..c9b6bef5904 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -538,7 +538,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
   }
   else {
     /* Avoid mirroring for unsupported contexts. */
-    t->options |= CTX_NO_MIRROR;
+    t->flag |= T_NO_MIRROR;
   }
 
   /* setting PET flag only if property exist in operator. Otherwise, assume it's not supported */