From 25c96bc9f348814d50095710c30ddc2776f5bb12 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Sep 2012 01:02:39 +0000 Subject: code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc --- source/blender/makesrna/intern/rna_actuator.c | 2 +- source/blender/makesrna/intern/rna_animation_api.c | 1 + source/blender/makesrna/intern/rna_armature_api.c | 2 ++ source/blender/makesrna/intern/rna_controller_api.c | 2 ++ source/blender/makesrna/intern/rna_main_api.c | 2 ++ source/blender/makesrna/intern/rna_mesh.c | 2 +- source/blender/makesrna/intern/rna_modifier.c | 2 +- source/blender/makesrna/intern/rna_nodetree.c | 2 +- source/blender/makesrna/intern/rna_scene_api.c | 2 ++ source/blender/makesrna/intern/rna_userdef.c | 2 +- 10 files changed, 14 insertions(+), 5 deletions(-) (limited to 'source/blender/makesrna/intern') diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index bb714043002..2ee47d2d54b 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -530,7 +530,7 @@ static void rna_Actuator_action_action_set(PointerRNA *ptr, PointerRNA value) #else -void rna_def_actuator(BlenderRNA *brna) +static void rna_def_actuator(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_animation_api.c b/source/blender/makesrna/intern/rna_animation_api.c index 32472c8d415..39128b48cd8 100644 --- a/source/blender/makesrna/intern/rna_animation_api.c +++ b/source/blender/makesrna/intern/rna_animation_api.c @@ -39,6 +39,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "rna_internal.h" /* own include */ #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_armature_api.c b/source/blender/makesrna/intern/rna_armature_api.c index 29dc23b7bef..b7ea642cb8b 100644 --- a/source/blender/makesrna/intern/rna_armature_api.c +++ b/source/blender/makesrna/intern/rna_armature_api.c @@ -36,6 +36,8 @@ #include "RNA_define.h" +#include "rna_internal.h" /* own include */ + #ifdef RNA_RUNTIME #include diff --git a/source/blender/makesrna/intern/rna_controller_api.c b/source/blender/makesrna/intern/rna_controller_api.c index 6fe90e1721b..639d6a330a5 100644 --- a/source/blender/makesrna/intern/rna_controller_api.c +++ b/source/blender/makesrna/intern/rna_controller_api.c @@ -35,6 +35,8 @@ #include "WM_types.h" #include "RNA_define.h" +#include "rna_internal.h" /* own include */ + #ifdef RNA_RUNTIME #include "BKE_sca.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 307982e4bb1..37cf780b762 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -635,6 +635,8 @@ void RNA_api_main(StructRNA *srna) RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_pointer(func, "image", "Image", "", "New image"); RNA_def_function_return(func, parm); +#else + (void)srna; #endif } diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index fe5f8e574a0..8d4681b4f12 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -2609,7 +2609,7 @@ static void rna_def_uv_textures(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); } -static void rna_def_skin_vertices(BlenderRNA *brna, PropertyRNA *cprop) +static void rna_def_skin_vertices(BlenderRNA *brna, PropertyRNA *UNUSED(cprop)) { StructRNA *srna; PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 084cda87507..d64e004e9ff 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2658,7 +2658,7 @@ static void rna_def_modifier_screw(BlenderRNA *brna) #endif } -static void rna_def_modifier_weightvg_mask(BlenderRNA *brna, StructRNA *srna) +static void rna_def_modifier_weightvg_mask(BlenderRNA *UNUSED(brna), StructRNA *srna) { static EnumPropertyItem weightvg_mask_tex_map_items[] = { {MOD_DISP_MAP_LOCAL, "LOCAL", 0, "Local", "Use local generated coordinates"}, diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 55dda3fc315..af4ae71f0f2 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4036,7 +4036,7 @@ static void rna_def_nodetree_link_api(BlenderRNA *brna, PropertyRNA *cprop) } /* shared between all note tree types*/ -static void rna_def_nodetree_active_api(StructRNA *srna, PropertyRNA *cprop) +static void rna_def_nodetree_active_api(StructRNA *srna, PropertyRNA *UNUSED(cprop)) { PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 69b61b47d8a..cdf7ac5e68f 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -40,6 +40,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "rna_internal.h" /* own include */ + #ifdef RNA_RUNTIME #include "BKE_animsys.h" diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index c64f4e4ff7e..f5bf7b5813e 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3593,7 +3593,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) "Enables automatic saving of preview images in the .blend file"); } -void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop) +static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; FunctionRNA *func; -- cgit v1.2.3