[Bf-blender-cvs] [ee5b6f71501] blender-v3.4-release: Hide ratio when using error margin mode in decimate keyframes operator

Colin Basnett noreply at git.blender.org
Wed Nov 9 00:31:15 CET 2022


Commit: ee5b6f7150109a62b2a435ecd011316ffceb9e59
Author: Colin Basnett
Date:   Tue Nov 8 15:29:57 2022 -0800
Branches: blender-v3.4-release
https://developer.blender.org/rBee5b6f7150109a62b2a435ecd011316ffceb9e59

Hide ratio when using error margin mode in decimate keyframes operator

This fixes a bug in the function that determines what properties to show
on the Decimate Keyframes operator.

Before the fix, the "Remove" (i.e., `factor`) slider was visible no
matter what "Mode" was being used. This meant that the slider was
visible and modifiable when it had no effect, creating confusion.

Reviewed By: sybren

Differential Revision: https://developer.blender.org/D16318

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

M	source/blender/editors/space_graph/graph_slider_ops.c

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

diff --git a/source/blender/editors/space_graph/graph_slider_ops.c b/source/blender/editors/space_graph/graph_slider_ops.c
index f3d92911155..62aecf930d3 100644
--- a/source/blender/editors/space_graph/graph_slider_ops.c
+++ b/source/blender/editors/space_graph/graph_slider_ops.c
@@ -458,16 +458,13 @@ static bool decimate_poll_property(const bContext *UNUSED(C),
                                    const PropertyRNA *prop)
 {
   const char *prop_id = RNA_property_identifier(prop);
+  const int mode = RNA_enum_get(op->ptr, "mode");
 
-  if (STRPREFIX(prop_id, "remove")) {
-    int mode = RNA_enum_get(op->ptr, "mode");
-
-    if (STREQ(prop_id, "factor") && mode != DECIM_RATIO) {
-      return false;
-    }
-    if (STREQ(prop_id, "remove_error_margin") && mode != DECIM_ERROR) {
-      return false;
-    }
+  if (STREQ(prop_id, "factor") && mode != DECIM_RATIO) {
+    return false;
+  }
+  if (STREQ(prop_id, "remove_error_margin") && mode != DECIM_ERROR) {
+    return false;
   }
 
   return true;



More information about the Bf-blender-cvs mailing list