diff options
Diffstat (limited to 'source/blender/makesrna/intern')
24 files changed, 25 insertions, 29 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index dbf436bd4bc..f83bc807138 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -33,7 +33,6 @@ #include "DNA_object_types.h" #include "BLI_utildefines.h" -#include "BLI_math_base.h" #include "BKE_icons.h" #include "BKE_library.h" @@ -93,6 +92,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = { #include "DNA_anim_types.h" #include "BLI_listbase.h" +#include "BLI_math_base.h" #include "BKE_font.h" #include "BKE_idprop.h" diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 53efbcb56fa..a2b6d188742 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -31,8 +31,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math_base.h" - #include "RNA_define.h" #include "rna_internal.h" diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 4116dd5753f..aa22bd49460 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -27,7 +27,6 @@ #include <stdlib.h> #include "BLI_math.h" -#include "BLI_listbase.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index c15740305a8..eaa0ddca7d3 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -27,7 +27,6 @@ #include <stdlib.h> #include <limits.h> -#include "BLI_math_base.h" #include "BKE_modifier.h" #include "BKE_dynamicpaint.h" diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 5062468387f..057cb9eba0d 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -33,7 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index da322307454..a747429ad4b 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -36,7 +36,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_string_utils.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -98,6 +97,7 @@ static EnumPropertyItem rna_enum_gpencil_caps_modes_items[] = { #ifdef RNA_RUNTIME #include "BLI_ghash.h" +#include "BLI_string_utils.h" #include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 0994d628778..84fb9d8f9bf 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -30,9 +30,7 @@ #include "DNA_scene_types.h" #include "BLI_utildefines.h" -#include "BLI_math_base.h" -#include "BKE_context.h" #include "BKE_image.h" #include "DEG_depsgraph.h" @@ -64,6 +62,8 @@ static const EnumPropertyItem image_source_items[] = { #ifdef RNA_RUNTIME +#include "BLI_math_base.h" + #include "BKE_global.h" #include "GPU_draw.h" diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 5181912f4eb..19550b8097f 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -33,7 +33,6 @@ #include "DNA_lattice_types.h" #include "DNA_mesh_types.h" -#include "BLI_string_utils.h" #include "BLI_utildefines.h" #include "BLI_math.h" @@ -53,6 +52,8 @@ #include "DNA_object_types.h" +#include "BLI_string_utils.h" + #include "BKE_animsys.h" #include "BKE_key.h" #include "BKE_main.h" diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index c84c59287a5..649b76f0390 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -28,8 +28,6 @@ #include "DNA_layer_types.h" #include "DNA_view3d_types.h" -#include "BLI_math.h" -#include "BLI_string_utils.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index 5cee2fb90cb..ada7d1f9067 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include "BLI_utildefines.h" -#include "BLI_string_utils.h" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -99,6 +98,8 @@ const EnumPropertyItem rna_enum_linestyle_geometry_modifier_type_items[] = { #ifdef RNA_RUNTIME +#include "BLI_string_utils.h" + #include "BKE_linestyle.h" #include "BKE_texture.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 806b1f6521b..f7e625b836e 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -39,7 +39,6 @@ #include "DNA_object_types.h" #include "BLI_utildefines.h" -#include "BLI_path_util.h" #include "RNA_define.h" #include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index 5f198d2e22e..98a8179576d 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -39,7 +39,6 @@ #include "BLI_sys_types.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "rna_internal.h" /* own include */ diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 422ef9d61e8..2999a8848b1 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -28,7 +28,6 @@ #include <string.h> #include <limits.h> -#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index e7f603b6c9d..36083296779 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -42,7 +42,6 @@ #include "DNA_shader_fx_types.h" #include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BKE_camera.h" #include "BKE_collection.h" diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 6850285057e..c5ace465cba 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -48,7 +48,6 @@ #include "BKE_mesh.h" -#include "BLI_string_utils.h" #include "BLT_translation.h" @@ -133,6 +132,7 @@ static const EnumPropertyItem part_hair_ren_as_items[] = { #ifdef RNA_RUNTIME #include "BLI_math.h" +#include "BLI_string_utils.h" #include "BKE_boids.h" #include "BKE_context.h" diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index e08b87877ae..8a0bb372628 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -40,7 +40,6 @@ #include "DNA_scene_types.h" #include "BLI_math.h" -#include "BLI_string_utils.h" #include "BLT_translation.h" @@ -77,6 +76,9 @@ const EnumPropertyItem rna_enum_color_sets_items[] = { #ifdef RNA_RUNTIME +#include "BLI_ghash.h" +#include "BLI_string_utils.h" + #include "BIK_api.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -85,8 +87,6 @@ const EnumPropertyItem rna_enum_color_sets_items[] = { #include "MEM_guardedalloc.h" -#include "BLI_ghash.h" - #include "BKE_context.h" #include "BKE_constraint.h" #include "BKE_global.h" diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index db44260f4b5..8dfea3c2a0f 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -43,7 +43,6 @@ #include "IMB_imbuf_types.h" #include "BLI_math.h" -#include "BLI_string_utils.h" #include "BLT_translation.h" @@ -484,6 +483,8 @@ const EnumPropertyItem rna_enum_transform_orientation_items[] = { #ifdef RNA_RUNTIME +#include "BLI_string_utils.h" + #include "DNA_anim_types.h" #include "DNA_color_types.h" #include "DNA_node_types.h" diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 950ed047532..b1603aa6532 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -42,7 +42,6 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BKE_main.h" #include "BKE_material.h" #include "BKE_paint.h" #include "BKE_brush.h" diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 49e014910f3..3dcbb612470 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -30,7 +30,6 @@ #include <limits.h> #include "BLI_sys_types.h" -#include "BLI_threads.h" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -52,6 +51,8 @@ #ifdef RNA_RUNTIME +#include "BLI_threads.h" + #include "BKE_colorband.h" #include "BKE_context.h" #include "BKE_particle.h" diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c index 1d513a494d7..556d40bf7ac 100644 --- a/source/blender/makesrna/intern/rna_texture_api.c +++ b/source/blender/makesrna/intern/rna_texture_api.c @@ -29,7 +29,6 @@ #include <string.h> #include "BLI_utildefines.h" -#include "BLI_path_util.h" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index ed41d209f6a..4c7c943de23 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -31,7 +31,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" @@ -48,6 +47,8 @@ #ifdef RNA_RUNTIME +#include "BLI_math.h" + #include "DNA_anim_types.h" #include "BKE_animsys.h" diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 391c2c87d50..fb7aad2b3c7 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -36,7 +36,6 @@ #include "BLI_utildefines.h" #include "BLI_math_base.h" -#include "BLI_math_vector.h" #include "BKE_appdir.h" #include "BKE_sound.h" @@ -97,6 +96,8 @@ static const EnumPropertyItem rna_enum_studio_light_type_items[] = { #ifdef RNA_RUNTIME +#include "BLI_math_vector.h" + #include "DNA_object_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 475f53d9ef1..45bce714303 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -32,7 +32,6 @@ #include "DNA_windowmanager_types.h" #include "BLI_utildefines.h" -#include "BLI_string_utils.h" #include "BLT_translation.h" @@ -48,6 +47,7 @@ #include "WM_types.h" #ifdef RNA_RUNTIME + static const EnumPropertyItem event_keymouse_value_items[] = { {KM_ANY, "ANY", 0, "Any", ""}, {KM_PRESS, "PRESS", 0, "Press", ""}, @@ -483,6 +483,8 @@ const EnumPropertyItem rna_enum_wm_report_items[] = { #include <assert.h> +#include "BLI_string_utils.h" + #include "WM_api.h" #include "DNA_object_types.h" diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index f7b0fa03c39..cdad88d2862 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -31,7 +31,6 @@ #include "DNA_windowmanager_types.h" #include "BLI_utildefines.h" -#include "BLI_string_utils.h" #include "BLT_translation.h" @@ -51,6 +50,8 @@ #include <assert.h> +#include "BLI_string_utils.h" + #include "WM_api.h" #include "DNA_workspace_types.h" |