[Bf-blender-cvs] [15855dcbcdb] lanpr-under-gp: LineArt: Fix compiler warnings and clang format

[Antonio Vazquez]

Commit: 15855dcbcdbb7fdd841970659ff126402cb40b2d
Author: Antonio Vazquez
Date:   Sun Aug 16 18:19:31 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rB15855dcbcdbb7fdd841970659ff126402cb40b2d

LineArt: Fix compiler warnings and clang format

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

M       source/blender/blenkernel/intern/scene.c
M       source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M       source/blender/gpu/intern/gpu_backend.hh
M       source/blender/makesrna/intern/rna_gpencil_modifier.c

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

diff --git a/source/blender/blenkernel/intern/scene.c 
b/source/blender/blenkernel/intern/scene.c
index adf7c3ef292..c65ec815d8d 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -223,14 +223,17 @@ static void scene_init_data(ID *id)
 
 static void BKE_lineart_free_everything(Scene *s)
 {
+#if 0
   SceneLineart *lineart = &s->lineart;
+#endif
   /* Nothing to free. Reserved for future. */
 }
 
 static void BKE_lineart_copy_data(const Scene *from, Scene *to)
 {
+#if 0
   const SceneLineart *lineart = &from->lineart;
-
+#endif
   /*  Line layer removed. Currently nothing to do. Reserved for future. */
 }
 
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c 
b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 60f10733919..4cfaf6131a6 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -86,11 +86,13 @@ static void generate_strokes_actual(
 {
   Scene *scene = DEG_get_evaluated_scene(depsgraph);
   LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
+#if 0
   int line_types = ((scene->flag & LRT_EVERYTHING_AS_CONTOUR) ?
                         LRT_EDGE_FLAG_ALL_TYPE :
                         ((scene->flag & LRT_INTERSECTION_AS_CONTOUR) ?
                              (lmd->line_types & LRT_EDGE_FLAG_INTERSECTION) :
                              lmd->line_types));
+#endif
   ED_lineart_gpencil_generate_strokes_direct(
       depsgraph,
       ob,
diff --git a/source/blender/gpu/intern/gpu_backend.hh 
b/source/blender/gpu/intern/gpu_backend.hh
index ba382e3c3fc..25d165098a7 100644
--- a/source/blender/gpu/intern/gpu_backend.hh
+++ b/source/blender/gpu/intern/gpu_backend.hh
@@ -25,9 +25,9 @@
 
 #pragma once
 
+#include "gpu_batch_private.hh"
 #include "gpu_context_private.hh"
 #include "gpu_drawlist_private.hh"
-#include "gpu_batch_private.hh"
 
 namespace blender {
 namespace gpu {
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c 
b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 48a76d31116..8f2207b7cca 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -2395,7 +2395,7 @@ static void rna_def_modifier_gpencillineart(BlenderRNA 
*brna)
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   prop = RNA_def_property(srna, "target_layer", PROP_STRING, PROP_NONE);
-  RNA_def_property_ui_text(prop, "Target Layer", "Grease pencil layer that 
strokes goes into.");
+  RNA_def_property_ui_text(prop, "Target Layer", "Grease pencil layer that 
strokes goes into");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   prop = RNA_def_property(srna, "thickness", PROP_INT, PROP_NONE);
@@ -2407,14 +2407,14 @@ static void rna_def_modifier_gpencillineart(BlenderRNA 
*brna)
 
   prop = RNA_def_property(srna, "opacity", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_default(prop, 0.1f);
-  RNA_def_property_ui_text(prop, "opacity", "The strength value used to 
generate strokes.");
+  RNA_def_property_ui_text(prop, "opacity", "The strength value used to 
generate strokes");
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.01f, 2);
   RNA_def_property_range(prop, 0.0f, 1.0f);
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   prop = RNA_def_property(srna, "pre_sample_length", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_default(prop, 0.0f);
-  RNA_def_property_ui_text(prop, "Pre Sample Length", "Sample strokes before 
sending out.");
+  RNA_def_property_ui_text(prop, "Pre Sample Length", "Sample strokes before 
sending out");
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.01f, 2);
   RNA_def_property_range(prop, 0.0f, 1.0f);
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs