[Bf-blender-cvs] [0a7628d6339] temp-graph-select-changes: Fix mistake in handle transform logic

Julian Eisel noreply at git.blender.org
Thu Oct 31 14:00:00 CET 2019


Commit: 0a7628d63393f530110b7e99947ee2c9110ce193
Author: Julian Eisel
Date:   Thu Oct 31 12:27:14 2019 +0100
Branches: temp-graph-select-changes
https://developer.blender.org/rB0a7628d63393f530110b7e99947ee2c9110ce193

Fix mistake in handle transform logic

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

M	source/blender/editors/transform/transform_convert.c
M	source/blender/editors/transform/transform_convert_graph.c

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

diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index 18a85f235ac..da75b910677 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -1274,7 +1274,7 @@ void remake_graph_transdata(TransInfo *t, ListBase *anim_data)
   bAnimListElem *ale;
   const bool use_handle =
 #if 1
-      false;
+      true;
   UNUSED_VARS(sipo);
 #else
       (sipo->flag & SIPO_NOHANDLES) == 0;
@@ -2095,7 +2095,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
     bAnimContext ac;
     const bool use_handle =
 #if 1
-        false;
+        true;
 #else
         (sipo->flag & SIPO_NOHANDLES) == 0;
 #endif
diff --git a/source/blender/editors/transform/transform_convert_graph.c b/source/blender/editors/transform/transform_convert_graph.c
index ebe53c383f8..265d333198f 100644
--- a/source/blender/editors/transform/transform_convert_graph.c
+++ b/source/blender/editors/transform/transform_convert_graph.c
@@ -171,8 +171,8 @@ static void graph_bezt_get_transform_selection(const TransInfo *t,
 {
   SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first;
   bool key = (bezt->f2 & SELECT) != 0;
-  bool left = use_handle ? key : (bezt->f1 & SELECT) != 0;
-  bool right = use_handle ? key : (bezt->f3 & SELECT) != 0;
+  bool left = use_handle ? ((bezt->f1 & SELECT) != 0) : key;
+  bool right = use_handle ? ((bezt->f3 & SELECT) != 0) : key;
 
   if (t->is_launch_event_tweak) {
     if (sipo->runtime.flag & SIPO_RUNTIME_FLAG_TWEAK_HANDLES_LEFT) {
@@ -235,7 +235,7 @@ void createTransGraphEditData(bContext *C, TransInfo *t)
   const bool is_translation_mode = graph_edit_is_translation_mode(t);
   const bool use_handle =
 #ifdef USE_HANDLES_AS_CHILD
-      false;
+      true;
 #else
       !(sipo->flag & SIPO_NOHANDLES);
 #endif
@@ -556,7 +556,7 @@ void createTransGraphEditData(bContext *C, TransInfo *t)
     }
 
     /* Sets handles based on the selection */
-    testhandles_fcurve(fcu, true);
+    testhandles_fcurve(fcu, use_handle);
   }
 
   if (is_prop_edit) {



More information about the Bf-blender-cvs mailing list