[Bf-blender-cvs] [1e4f6b231ce] master: Cleanup: use static declaration

Campbell Barton noreply at git.blender.org
Sun Mar 22 01:59:46 CET 2020


Commit: 1e4f6b231ce54e894b308c00e56525c085db8781
Author: Campbell Barton
Date:   Sun Mar 22 11:51:15 2020 +1100
Branches: master
https://developer.blender.org/rB1e4f6b231ce54e894b308c00e56525c085db8781

Cleanup: use static declaration

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

M	source/blender/blenkernel/intern/volume.cc
M	source/blender/draw/engines/eevee/eevee_bloom.c
M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index 64d985ab7ec..c568cb66cc5 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -88,7 +88,7 @@ static CLG_LogRef LOG = {"bke.volume"};
  * out of file descriptors or prevent other applications from writing to it.
  */
 
-struct VolumeFileCache {
+static struct VolumeFileCache {
   /* Cache Entry */
   struct Entry {
     Entry(const std::string &filepath, const openvdb::GridBase::Ptr &grid)
diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c
index 53465455d57..6545a1bca84 100644
--- a/source/blender/draw/engines/eevee/eevee_bloom.c
+++ b/source/blender/draw/engines/eevee/eevee_bloom.c
@@ -40,7 +40,7 @@ static struct {
 
 extern char datatoc_effect_bloom_frag_glsl[];
 
-const bool use_highres = true;
+static const bool use_highres = true;
 
 static void eevee_create_shader_bloom(void)
 {
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 1b511ea1f7f..7ffa02189e2 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -693,7 +693,7 @@ void GPENCIL_cache_finish(void *ved)
                                         GPU_ATTACHMENT_TEXTURE(pd->color_layer_tx),
                                         GPU_ATTACHMENT_TEXTURE(pd->reveal_layer_tx),
                                     });
-    };
+    }
 
     if (pd->use_object_fb) {
       pd->color_object_tx = DRW_texture_pool_query_2d(
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 5f6fcc71706..29c36b21b7f 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -122,7 +122,7 @@ const EnumPropertyItem rna_enum_mapping_type_items[] = {
     {0, NULL, 0, NULL, NULL},
 };
 
-const EnumPropertyItem rna_enum_vector_rotate_type_items[] = {
+static const EnumPropertyItem rna_enum_vector_rotate_type_items[] = {
     {NODE_VECTOR_ROTATE_TYPE_AXIS,
      "AXIS_ANGLE",
      0,
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index acc4f16c45c..34cc75396de 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1321,7 +1321,7 @@ static void rna_def_userdef_theme_ui_panel(BlenderRNA *brna)
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
 }
 
-const EnumPropertyItem rna_enum_userdef_theme_background_types_items[] = {
+static const EnumPropertyItem rna_enum_userdef_theme_background_types_items[] = {
     {TH_BACKGROUND_SINGLE_COLOR,
      "SINGLE_COLOR",
      0,



More information about the Bf-blender-cvs mailing list