diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 13:44:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 13:45:43 +0300 |
commit | 31fcd40efd3a98113cec837282c6dd2e1d34caa1 (patch) | |
tree | da77d9a90cd69c689902d851adc4fcb3d8c30a25 /source/blender/makesrna | |
parent | f945303877e65999fbae7a37ba5a223367259396 (diff) |
Cleanup: use static variables
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_context.c | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_rigidbody.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_shader_fx.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_context.c b/source/blender/makesrna/intern/rna_context.c index 781be07f1dc..618cefe13e5 100644 --- a/source/blender/makesrna/intern/rna_context.c +++ b/source/blender/makesrna/intern/rna_context.c @@ -34,6 +34,7 @@ #include "RNA_access.h" #include "RNA_define.h" +#include "RNA_enum_types.h" #include "rna_internal.h" /* own include */ diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index 47075d0d4f7..899439e1a02 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -77,7 +77,7 @@ const EnumPropertyItem rna_enum_rigidbody_constraint_type_items[] = { {0, NULL, 0, NULL, NULL}}; /* bullet spring type */ -const EnumPropertyItem rna_enum_rigidbody_constraint_spring_type_items[] = { +static const EnumPropertyItem rna_enum_rigidbody_constraint_spring_type_items[] = { {RBC_SPRING_TYPE1, "SPRING1", ICON_NONE, "Blender 2.7", "Spring implementation used in blender 2.7. Damping is capped at 1.0"}, {RBC_SPRING_TYPE2, "SPRING2", ICON_NONE, "Blender 2.8", "New implementation available since 2.8"}, {0, NULL, 0, NULL, NULL}}; diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 6a6c97b41ad..1f8f95cf380 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -76,12 +76,12 @@ const EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[] = { { 0, NULL, 0, NULL, NULL } }; -EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = { +#ifndef RNA_RUNTIME +static EnumPropertyItem rna_enum_gpencil_weight_brush_items[] = { { GP_EDITBRUSH_TYPE_WEIGHT, "WEIGHT", ICON_GPBRUSH_WEIGHT, "Weight", "Weight Paint for Vertex Groups" }, { 0, NULL, 0, NULL, NULL } }; -#ifndef RNA_RUNTIME static const EnumPropertyItem rna_enum_gpencil_lockaxis_items[] = { { GP_LOCKAXIS_NONE, "GP_LOCKAXIS_NONE", ICON_UNLOCKED, "None", "" }, { GP_LOCKAXIS_X, "GP_LOCKAXIS_X", ICON_NDOF_DOM, "X", "Project strokes to plane locked to X" }, diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c index a005699dc32..da4470ccff7 100644 --- a/source/blender/makesrna/intern/rna_shader_fx.c +++ b/source/blender/makesrna/intern/rna_shader_fx.c @@ -60,7 +60,7 @@ const EnumPropertyItem rna_enum_object_shaderfx_type_items[] = { {0, NULL, 0, NULL, NULL} }; -const EnumPropertyItem rna_enum_shaderfx_rim_modes_items[] = { +static const EnumPropertyItem rna_enum_shaderfx_rim_modes_items[] = { {eShaderFxRimMode_Normal, "NORMAL", 0, "Normal", "" }, {eShaderFxRimMode_Overlay, "OVERLAY", 0, "Overlay", "" }, {eShaderFxRimMode_Add, "ADD", 0, "Add", "" }, @@ -70,7 +70,7 @@ const EnumPropertyItem rna_enum_shaderfx_rim_modes_items[] = { {0, NULL, 0, NULL, NULL } }; -const EnumPropertyItem rna_enum_shaderfx_colorize_modes_items[] = { +static const EnumPropertyItem rna_enum_shaderfx_colorize_modes_items[] = { {eShaderFxColorizeMode_GrayScale, "GRAYSCALE", 0, "Gray Scale", "" }, {eShaderFxColorizeMode_Sepia, "SEPIA", 0, "Sepia", "" }, {eShaderFxColorizeMode_BiTone, "BITONE", 0, "Bi-Tone", "" }, diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 56491fd70e4..ab662e71380 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -244,7 +244,7 @@ const EnumPropertyItem rna_enum_shading_type_items[] = { {0, NULL, 0, NULL, NULL} }; -const EnumPropertyItem rna_enum_viewport_lighting_items[] = { +static const EnumPropertyItem rna_enum_viewport_lighting_items[] = { {V3D_LIGHTING_FLAT, "FLAT", 0, "Flat", "Display using flat lighting"}, {V3D_LIGHTING_STUDIO, "STUDIO", 0, "Studio", "Display using studio lighting"}, {V3D_LIGHTING_MATCAP, "MATCAP", 0, "MatCap", "Display using matcap material and lighting"}, |