[Bf-blender-cvs] [57090a4b722] master: Cleanup: Remove ifdef'd node transform code

[Hans Goudey]

Commit: 57090a4b7228f065c22fcf2ac2e70e7a0ab10c2d
Author: Hans Goudey
Date:   Mon Dec 12 17:09:58 2022 -0600
Branches: master
https://developer.blender.org/rB57090a4b7228f065c22fcf2ac2e70e7a0ab10c2d

Cleanup: Remove ifdef'd node transform code

This has been turned off since 2013.

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

M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_convert_node.cc
M	source/blender/editors/transform/transform_snap.cc

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

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index a73b82b9092..169937d17e2 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -23,10 +23,6 @@
 extern "C" {
 #endif
 
-/* use node center for transform instead of upper-left corner.
- * disabled since it makes absolute snapping not work so nicely
- */
-// #define USE_NODE_CENTER
 
 /* -------------------------------------------------------------------- */
 /** \name Types/
diff --git a/source/blender/editors/transform/transform_convert_node.cc b/source/blender/editors/transform/transform_convert_node.cc
index 8b15302853b..f07baa09e8c 100644
--- a/source/blender/editors/transform/transform_convert_node.cc
+++ b/source/blender/editors/transform/transform_convert_node.cc
@@ -57,13 +57,8 @@ static void create_transform_data_for_node(TransData &td,
 
   /* use top-left corner as the transform origin for nodes */
   /* Weirdo - but the node system is a mix of free 2d elements and DPI sensitive UI. */
-#ifdef USE_NODE_CENTER
-  td2d.loc[0] = (locx * dpi_fac) + (BLI_rctf_size_x(&node.runtime->totr) * +0.5f);
-  td2d.loc[1] = (locy * dpi_fac) + (BLI_rctf_size_y(&node.runtime->totr) * -0.5f);
-#else
   td2d.loc[0] = locx * dpi_fac;
   td2d.loc[1] = locy * dpi_fac;
-#endif
   td2d.loc[2] = 0.0f;
   td2d.loc2d = td2d.loc; /* current location */
 
@@ -235,11 +230,6 @@ static void flushTransNodes(TransInfo *t)
       float loc[2];
       add_v2_v2v2(loc, td2d->loc, offset);
 
-#ifdef USE_NODE_CENTER
-      loc[0] -= 0.5f * BLI_rctf_size_x(&node->runtime->totr);
-      loc[1] += 0.5f * BLI_rctf_size_y(&node->runtime->totr);
-#endif
-
       /* Weirdo - but the node system is a mix of free 2d elements and DPI sensitive UI. */
       loc[0] /= dpi_fac;
       loc[1] /= dpi_fac;
diff --git a/source/blender/editors/transform/transform_snap.cc b/source/blender/editors/transform/transform_snap.cc
index 5373bdd7834..0157f478b57 100644
--- a/source/blender/editors/transform/transform_snap.cc
+++ b/source/blender/editors/transform/transform_snap.cc
@@ -1190,36 +1190,19 @@ static void TargetSnapOffset(TransInfo *t, TransData *td)
   if (t->spacetype == SPACE_NODE && td != nullptr) {
     bNode *node = static_cast<bNode *>(td->extra);
     char border = t->tsnap.snapNodeBorder;
-    float width = BLI_rctf_size_x(&node->runtime->totr);
-    float height = BLI_rctf_size_y(&node->runtime->totr);
 
-#ifdef USE_NODE_CENTER
-    if (border & NODE_LEFT) {
-      t->tsnap.snapTarget[0] -= 0.5f * width;
-    }
-    if (border & NODE_RIGHT) {
-      t->tsnap.snapTarget[0] += 0.5f * width;
-    }
-    if (border & NODE_BOTTOM) {
-      t->tsnap.snapTarget[1] -= 0.5f * height;
-    }
-    if (border & NODE_TOP) {
-      t->tsnap.snapTarget[1] += 0.5f * height;
-    }
-#else
     if (border & NODE_LEFT) {
       t->tsnap.snapTarget[0] -= 0.0f;
     }
     if (border & NODE_RIGHT) {
-      t->tsnap.snapTarget[0] += width;
+      t->tsnap.snapTarget[0] += BLI_rctf_size_x(&node->runtime->totr);
     }
     if (border & NODE_BOTTOM) {
-      t->tsnap.snapTarget[1] -= height;
+      t->tsnap.snapTarget[1] -= BLI_rctf_size_y(&node->runtime->totr);
     }
     if (border & NODE_TOP) {
       t->tsnap.snapTarget[1] += 0.0f;
     }
-#endif
   }
 }