[Bf-blender-cvs] [bd71dbefa96] temp-graph-select-changes: Minor cleanup: Clarify logic

[Julian Eisel]

Commit: bd71dbefa968fae61858af88fa37392d67ea6c7d
Author: Julian Eisel
Date:   Thu Nov 14 17:25:45 2019 +0100
Branches: temp-graph-select-changes
https://developer.blender.org/rBbd71dbefa968fae61858af88fa37392d67ea6c7d

Minor cleanup: Clarify logic

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

M	source/blender/editors/space_graph/graph_select.c
M	source/blender/editors/transform/transform_convert_graph.c

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

diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index 89da4ce26d2..56a29f973e2 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -1444,9 +1444,9 @@ static int mouse_graph_keys(bAnimContext *ac,
                           SIPO_RUNTIME_FLAG_TWEAK_HANDLES_RIGHT);
 
   const bool already_selected =
-      nvi && (((nvi->hpoint == NEAREST_HANDLE_KEY) && (nvi->bezt->f2 & SELECT)) ||
-              ((nvi->hpoint == NEAREST_HANDLE_LEFT) && (nvi->bezt->f1 & SELECT)) ||
-              ((nvi->hpoint == NEAREST_HANDLE_RIGHT) && (nvi->bezt->f3 & SELECT)));
+      (nvi != NULL) && (((nvi->hpoint == NEAREST_HANDLE_KEY) && (nvi->bezt->f2 & SELECT)) ||
+                        ((nvi->hpoint == NEAREST_HANDLE_LEFT) && (nvi->bezt->f1 & SELECT)) ||
+                        ((nvi->hpoint == NEAREST_HANDLE_RIGHT) && (nvi->bezt->f3 & SELECT)));
 
   if (wait_to_deselect_others && nvi && already_selected) {
     ret_val = OPERATOR_RUNNING_MODAL;
diff --git a/source/blender/editors/transform/transform_convert_graph.c b/source/blender/editors/transform/transform_convert_graph.c
index 373ecbd9297..da9b24a3b01 100644
--- a/source/blender/editors/transform/transform_convert_graph.c
+++ b/source/blender/editors/transform/transform_convert_graph.c
@@ -181,18 +181,14 @@ static void graph_bezt_get_transform_selection(const TransInfo *t,
     }
   }
 
+  /* Whenever we move the key, we also move both handles. */
+  if (key) {
+    left = right = true;
+  }
+
   *r_key = key;
-  /* Whenever we move the key, we also move both handles (with USE_HANDLES_AS_CHILD). */
-  *r_left_handle =
-#ifdef USE_HANDLES_AS_CHILD
-      key ||
-#endif
-      left;
-  *r_right_handle =
-#ifdef USE_HANDLES_AS_CHILD
-      key ||
-#endif
-      right;
+  *r_left_handle = left;
+  *r_right_handle = right;
 }
 
 static void graph_key_shortest_dist(