[Bf-blender-cvs] [a7c9fb59ca9] master: Cleanup: follow code-style for float suffix

Campbell Barton noreply at git.blender.org
Thu Jan 13 02:35:53 CET 2022


Commit: a7c9fb59ca9f2cd21ae65c85453932852f75d5b4
Author: Campbell Barton
Date:   Thu Jan 13 12:34:28 2022 +1100
Branches: master
https://developer.blender.org/rBa7c9fb59ca9f2cd21ae65c85453932852f75d5b4

Cleanup: follow code-style for float suffix

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

M	source/blender/editors/animation/keyframes_keylist_test.cc
M	source/blender/makesrna/intern/rna_sequencer.c
M	source/blender/nodes/composite/nodes/node_composite_zcombine.cc

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

diff --git a/source/blender/editors/animation/keyframes_keylist_test.cc b/source/blender/editors/animation/keyframes_keylist_test.cc
index 17a21be5ae8..914693842ca 100644
--- a/source/blender/editors/animation/keyframes_keylist_test.cc
+++ b/source/blender/editors/animation/keyframes_keylist_test.cc
@@ -26,12 +26,12 @@ static void build_fcurve(FCurve &fcurve)
   fcurve.totvert = 3;
   fcurve.bezt = static_cast<BezTriple *>(
       MEM_callocN(sizeof(BezTriple) * fcurve.totvert, "BezTriples"));
-  fcurve.bezt[0].vec[1][0] = 10.f;
-  fcurve.bezt[0].vec[1][1] = 1.f;
-  fcurve.bezt[1].vec[1][0] = 20.f;
-  fcurve.bezt[1].vec[1][1] = 2.f;
-  fcurve.bezt[2].vec[1][0] = 30.f;
-  fcurve.bezt[2].vec[1][1] = 1.f;
+  fcurve.bezt[0].vec[1][0] = 10.0f;
+  fcurve.bezt[0].vec[1][1] = 1.0f;
+  fcurve.bezt[1].vec[1][0] = 20.0f;
+  fcurve.bezt[1].vec[1][1] = 2.0f;
+  fcurve.bezt[2].vec[1][0] = 30.0f;
+  fcurve.bezt[2].vec[1][1] = 1.0f;
 }
 
 static AnimKeylist *create_test_keylist()
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 9be66a6553b..6c3e3ab3058 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -3012,7 +3012,7 @@ static void rna_def_text(StructRNA *srna)
   RNA_def_property_float_sdna(prop, NULL, "text_size");
   RNA_def_property_ui_text(prop, "Size", "Size of the text");
   RNA_def_property_range(prop, 0.0, 2000);
-  RNA_def_property_ui_range(prop, 0.0f, 2000, 10.f, 1);
+  RNA_def_property_ui_range(prop, 0.0f, 2000, 10.0f, 1);
   RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_raw_update");
 
   prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR_GAMMA);
diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc
index d653935aa66..7a6d5b3af5f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc
@@ -33,9 +33,9 @@ namespace blender::nodes::node_composite_zcombine_cc {
 static void cmp_node_zcombine_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
-  b.add_input<decl::Float>(N_("Z")).default_value(1.0f).min(0.f).max(10000.0f);
+  b.add_input<decl::Float>(N_("Z")).default_value(1.0f).min(0.0f).max(10000.0f);
   b.add_input<decl::Color>(N_("Image"), "Image_001").default_value({1.0f, 1.0f, 1.0f, 1.0f});
-  b.add_input<decl::Float>(N_("Z"), "Z_001").default_value(1.0f).min(0.f).max(10000.0f);
+  b.add_input<decl::Float>(N_("Z"), "Z_001").default_value(1.0f).min(0.0f).max(10000.0f);
   b.add_output<decl::Color>(N_("Image"));
   b.add_output<decl::Float>(N_("Z"));
 }



More information about the Bf-blender-cvs mailing list