[Bf-blender-cvs] [b1696702cdb] master: Fix: Remove line from common invoke

Christoph Lendenfeld noreply at git.blender.org
Mon Dec 6 23:27:08 CET 2021


Commit: b1696702cdb74c2b6d7c8c3f9d204f108607a8ab
Author: Christoph Lendenfeld
Date:   Mon Dec 6 22:27:04 2021 +0000
Branches: master
https://developer.blender.org/rBb1696702cdb74c2b6d7c8c3f9d204f108607a8ab

Fix: Remove line from common invoke

The line that sets the factor_prop in graph_slider_ops.c
has been left in the common invoke function by accident.

Reviewed by: Sybren A. Stüvel
Differential Revision: https://developer.blender.org/D13477
Ref: D13477

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/editors/space_graph/graph_slider_ops.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 8ee2942570f..9d270fd007f 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 8ee2942570f08d10484bb2328d0d1b0aaaa0367c
+Subproject commit 9d270fd007f628b23ccbcbd87caa2dc35286b26a
diff --git a/release/scripts/addons b/release/scripts/addons
index f2a08d80ccd..b3c179b2869 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f2a08d80ccd3c13af304525778df3905f95bd44d
+Subproject commit b3c179b2869d86c44a4b29e2c638ce2a596a820d
diff --git a/source/blender/editors/space_graph/graph_slider_ops.c b/source/blender/editors/space_graph/graph_slider_ops.c
index f16f481b5ed..9bd5c6ede84 100644
--- a/source/blender/editors/space_graph/graph_slider_ops.c
+++ b/source/blender/editors/space_graph/graph_slider_ops.c
@@ -303,8 +303,6 @@ static int graph_slider_invoke(bContext *C, wmOperator *op, const wmEvent *event
     return OPERATOR_CANCELLED;
   }
 
-  gso->factor_prop = RNA_struct_find_property(op->ptr, "factor");
-
   gso->scene = CTX_data_scene(C);
   gso->area = CTX_wm_area(C);
   gso->region = CTX_wm_region(C);
@@ -412,6 +410,7 @@ static int decimate_invoke(bContext *C, wmOperator *op, const wmEvent *event)
   }
 
   tGraphSliderOp *gso = op->customdata;
+  gso->factor_prop = RNA_struct_find_property(op->ptr, "factor");
   gso->modal_update = decimate_modal_update;
   ED_slider_allow_overshoot_set(gso->slider, false);
 
diff --git a/source/tools b/source/tools
index 2e8c8792488..b22d19e47f4 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2e8c879248822c8e500ed49d79acc605e5aa75b9
+Subproject commit b22d19e47f4d0353082f3d9f30ee8d244c5266d5



More information about the Bf-blender-cvs mailing list