[Bf-blender-cvs] [16915595348] temp-gpencil-io: Cleanup const variables

Antonio Vazquez noreply at git.blender.org
Wed Mar 17 16:32:57 CET 2021


Commit: 169155953480458295daf8288d15354d790fc28e
Author: Antonio Vazquez
Date:   Wed Mar 17 16:32:51 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rB169155953480458295daf8288d15354d790fc28e

Cleanup const variables

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

M	source/blender/editors/io/io_gpencil_export.c
M	source/blender/editors/io/io_gpencil_import.c

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

diff --git a/source/blender/editors/io/io_gpencil_export.c b/source/blender/editors/io/io_gpencil_export.c
index e57be3e155c..f8af47e25db 100644
--- a/source/blender/editors/io/io_gpencil_export.c
+++ b/source/blender/editors/io/io_gpencil_export.c
@@ -128,10 +128,8 @@ static void gpencil_export_common_props_svg(wmOperatorType *ot)
       100.0f);
 }
 
-static int wm_gpencil_export_svg_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+static int wm_gpencil_export_svg_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
-  UNUSED_VARS(event);
-
   if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
     Main *bmain = CTX_data_main(C);
     char filepath[FILE_MAX];
@@ -201,7 +199,7 @@ static int wm_gpencil_export_svg_exec(bContext *C, wmOperator *op)
 
   /* Do export. */
   WM_cursor_wait(true);
-  bool done = gpencil_io_export(filename, &params);
+  const bool done = gpencil_io_export(filename, &params);
   WM_cursor_wait(false);
 
   if (!done) {
@@ -343,9 +341,10 @@ static int wm_gpencil_export_pdf_exec(bContext *C, wmOperator *op)
   SET_FLAG_FROM_TEST(flag, use_fill, GP_EXPORT_FILL);
   SET_FLAG_FROM_TEST(flag, use_norm_thickness, GP_EXPORT_NORM_THICKNESS);
 
-  float paper[2];
-  paper[0] = scene->r.xsch * (scene->r.size / 100.0f);
-  paper[1] = scene->r.ysch * (scene->r.size / 100.0f);
+  const float paper[2] = {
+      scene->r.xsch * (scene->r.size / 100.0f),
+      scene->r.ysch * (scene->r.size / 100.0f),
+  };
 
   struct GpencilIOParams params = {.C = C,
                                    .region = region,
@@ -364,7 +363,7 @@ static int wm_gpencil_export_pdf_exec(bContext *C, wmOperator *op)
 
   /* Do export. */
   WM_cursor_wait(true);
-  bool done = gpencil_io_export(filename, &params);
+  const bool done = gpencil_io_export(filename, &params);
   WM_cursor_wait(false);
 
   if (!done) {
diff --git a/source/blender/editors/io/io_gpencil_import.c b/source/blender/editors/io/io_gpencil_import.c
index 28a8fcde401..9445e39dea1 100644
--- a/source/blender/editors/io/io_gpencil_import.c
+++ b/source/blender/editors/io/io_gpencil_import.c
@@ -144,7 +144,7 @@ static int wm_gpencil_import_svg_exec(bContext *C, wmOperator *op)
 
   /* Do Import. */
   WM_cursor_wait(1);
-  bool done = gpencil_io_import(filename, &params);
+  const bool done = gpencil_io_import(filename, &params);
   WM_cursor_wait(0);
 
   if (!done) {



More information about the Bf-blender-cvs mailing list