Commit: 96e2bd84932a826d09b7ed2201ba67a0a74f0b29 Author: Dalai Felinto Date: Fri Mar 6 16:45:06 2020 +0100 Branches: master https://developer.blender.org/rB96e2bd84932a826d09b7ed2201ba67a0a74f0b29
Cleanup: Fix forward declaration of headers =================================================================== M intern/ghost/intern/GHOST_EventButton.h M intern/memutil/CMakeLists.txt M intern/memutil/MEM_CacheLimiterC-Api.h M source/blender/blenkernel/BKE_boids.h M source/blender/blenkernel/BKE_curve.h M source/blender/blenkernel/BKE_dynamicpaint.h M source/blender/blenkernel/BKE_global.h M source/blender/blenkernel/BKE_image.h M source/blender/blenkernel/BKE_paint.h M source/blender/blenkernel/BKE_text_suggestions.h M source/blender/blenlib/BLI_array_utils.h M source/blender/blenlib/BLI_bitmap.h M source/blender/blenlib/BLI_edgehash.h M source/blender/blenlib/BLI_endian_switch.h M source/blender/blenlib/BLI_fileops.h M source/blender/blenlib/BLI_ghash.h M source/blender/blenlib/BLI_hash.h M source/blender/blenlib/BLI_heap.h M source/blender/blenlib/BLI_kdtree_impl.h M source/blender/blenlib/BLI_math_matrix.h M source/blender/blenlib/BLI_math_rotation.h M source/blender/blenlib/BLI_math_vector.h M source/blender/blenlib/BLI_memory_utils_cxx.h M source/blender/blenlib/BLI_mempool.h M source/blender/blenlib/BLI_path_util.h M source/blender/blenlib/BLI_string.h M source/blender/blenlib/BLI_string_utils.h M source/blender/blenlib/BLI_threads.h M source/blender/blenlib/intern/math_geom_inline.c M source/blender/bmesh/intern/bmesh_construct.h M source/blender/bmesh/intern/bmesh_error.h M source/blender/bmesh/intern/bmesh_mesh.h M source/blender/bmesh/intern/bmesh_mesh_conv.h M source/blender/compositor/intern/COM_MemoryProxy.h M source/blender/compositor/operations/COM_ImageOperation.h M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h M source/blender/compositor/operations/COM_RenderLayersProg.h M source/blender/editors/interface/interface_intern.h M source/blender/gpu/GPU_draw.h M source/blender/gpu/GPU_init_exit.h M source/blender/imbuf/intern/IMB_filetype.h M source/blender/io/collada/AnimationClipExporter.h M source/blender/makesdna/DNA_defaults.h M source/blender/makesdna/DNA_fluid_types.h M source/blender/makesdna/DNA_rigidbody_types.h M source/blender/physics/intern/eigen_utils.h M source/blender/python/BPY_extern.h M source/blender/python/generic/blf_py_api.h M source/blender/windowmanager/message_bus/intern/wm_message_bus_intern.h M source/blender/windowmanager/message_bus/wm_message_bus.h =================================================================== diff --git a/intern/ghost/intern/GHOST_EventButton.h b/intern/ghost/intern/GHOST_EventButton.h index 0f9d3b7e6bc..e854bc23e5a 100644 --- a/intern/ghost/intern/GHOST_EventButton.h +++ b/intern/ghost/intern/GHOST_EventButton.h @@ -26,6 +26,7 @@ #define __GHOST_EVENTBUTTON_H__ #include "GHOST_Event.h" +#include "GHOST_Window.h" /** * Mouse button event. diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index 567e5d63ff9..32a844f06e8 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -21,6 +21,7 @@ set(INC . .. + ../../source/blender/blenlib ) set(INC_SYS diff --git a/intern/memutil/MEM_CacheLimiterC-Api.h b/intern/memutil/MEM_CacheLimiterC-Api.h index 7ea3821d5ed..690763a14f0 100644 --- a/intern/memutil/MEM_CacheLimiterC-Api.h +++ b/intern/memutil/MEM_CacheLimiterC-Api.h @@ -25,6 +25,8 @@ extern "C" { #endif +#include "BLI_utildefines.h" + struct MEM_CacheLimiter_s; struct MEM_CacheLimiterHandle_s; diff --git a/source/blender/blenkernel/BKE_boids.h b/source/blender/blenkernel/BKE_boids.h index f748143818c..f9fd814b5f2 100644 --- a/source/blender/blenkernel/BKE_boids.h +++ b/source/blender/blenkernel/BKE_boids.h @@ -25,6 +25,7 @@ */ #include "DNA_boid_types.h" +#include "DNA_particle_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 6a11471064c..164867b228b 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -27,6 +27,8 @@ extern "C" { #endif +#include "DNA_scene_types.h" + struct BezTriple; struct Curve; struct Depsgraph; diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index 8c6b16ed1e4..0dc133e34b3 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -25,10 +25,13 @@ extern "C" { #endif +#include "BLI_utildefines.h" + struct Depsgraph; struct DynamicPaintCanvasSettings; struct DynamicPaintModifierData; struct DynamicPaintRuntime; +struct Object; struct Scene; /* Actual surface point */ diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 93840db49c9..fe050075bae 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -27,6 +27,7 @@ * for every fresh Blender run. */ +#include "BLI_utildefines.h" #include "DNA_listBase.h" #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index a082e53cfc1..524bd3318f6 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -27,6 +27,8 @@ extern "C" { #endif +#include "BLI_utildefines.h" + struct Depsgraph; struct ID; struct ImBuf; diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index ceb48783e20..9650f8eed6e 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -63,6 +63,7 @@ struct bToolRef; enum eOverlayFlags; +#include "BLI_utildefines.h" #include "DNA_object_enums.h" extern const char PAINT_CURSOR_SCULPT[3]; diff --git a/source/blender/blenkernel/BKE_text_suggestions.h b/source/blender/blenkernel/BKE_text_suggestions.h index 80c38719f96..dc908ee5232 100644 --- a/source/blender/blenkernel/BKE_text_suggestions.h +++ b/source/blender/blenkernel/BKE_text_suggestions.h @@ -27,6 +27,8 @@ extern "C" { #endif +#include "DNA_text_types.h" + /* **************************************************************************** * Suggestions should be added in sorted order although a linear sorting method is * implemented. The list is then divided up based on the prefix provided by diff --git a/source/blender/blenlib/BLI_array_utils.h b/source/blender/blenlib/BLI_array_utils.h index f70aa3b54fa..afa9a3d2241 100644 --- a/source/blender/blenlib/BLI_array_utils.h +++ b/source/blender/blenlib/BLI_array_utils.h @@ -23,6 +23,7 @@ */ #include "BLI_compiler_typecheck.h" +#include "BLI_sys_types.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_bitmap.h b/source/blender/blenlib/BLI_bitmap.h index 3772a063515..d67fbabd11c 100644 --- a/source/blender/blenlib/BLI_bitmap.h +++ b/source/blender/blenlib/BLI_bitmap.h @@ -28,6 +28,8 @@ extern "C" { #endif +#include "BLI_utildefines.h" + typedef unsigned int BLI_bitmap; /* warning: the bitmap does not keep track of its own size or check diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h index bd149e2eaa0..0e2d0b538c7 100644 --- a/source/blender/blenlib/BLI_edgehash.h +++ b/source/blender/blenlib/BLI_edgehash.h @@ -22,6 +22,7 @@ */ #include "BLI_compiler_attrs.h" +#include "BLI_utildefines.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_endian_switch.h b/source/blender/blenlib/BLI_endian_switch.h index a07508e31a0..c67c098053d 100644 --- a/source/blender/blenlib/BLI_endian_switch.h +++ b/source/blender/blenlib/BLI_endian_switch.h @@ -22,6 +22,7 @@ */ #include "BLI_compiler_attrs.h" +#include "BLI_utildefines.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index 74e6c32b288..d908c47b400 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -25,9 +25,9 @@ #ifndef __BLI_FILEOPS_H__ #define __BLI_FILEOPS_H__ +#include <stdint.h> #include <stdio.h> #include <sys/stat.h> -#include <stdint.h> #ifdef __cplusplus extern "C" { @@ -39,6 +39,7 @@ extern "C" { #include <limits.h> /* for PATH_MAX */ #include "BLI_compiler_attrs.h" +#include "BLI_utildefines.h" #ifndef PATH_MAX # define PATH_MAX 4096 diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index f59d9ea99d0..141c631381b 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -28,8 +28,9 @@ * This is also used to implement a 'set' (see #GSet below). */ -#include "BLI_sys_types.h" /* for bool */ #include "BLI_compiler_attrs.h" +#include "BLI_compiler_compat.h" +#include "BLI_sys_types.h" /* for bool */ #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h index 59ed2b273b5..d09291b64be 100644 --- a/source/blender/blenlib/BLI_hash.h +++ b/source/blender/blenlib/BLI_hash.h @@ -25,6 +25,8 @@ extern "C" { #endif +#include "BLI_utildefines.h" + BLI_INLINE unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky) { #define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k)))) diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h index 3ce8da7e03c..fa8e49ef376 100644 --- a/source/blender/blenlib/BLI_heap.h +++ b/source/blender/blenlib/BLI_heap.h @@ -26,6 +26,8 @@ extern "C" { #endif +#include "BLI_math.h" + struct Heap; struct HeapNode; typedef struct Heap Heap; diff --git a/source/blender/blenlib/BLI_kdtree_impl.h b/source/blender/blenlib/BLI_kdtree_impl.h index c028266ef64..4b2a37830ae 100644 --- a/source/blender/blenlib/BLI_kdtree_impl.h +++ b/source/blender/blenlib/BLI_kdtree_impl.h @@ -20,6 +20,7 @@ */ #include "BLI_compiler_attrs.h" +#include "BLI_sys_types.h" #define _BLI_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) MACRO_ARG1##MACRO_ARG2 #define _BLI_CONCAT(MACRO_ARG1, MACRO_ARG2) _BLI_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2) diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index 7845e0998e0..1221ecfb7b1 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -31,6 +31,7 @@ extern "C" { #endif #include "BLI_compiler_attrs.h" +#include "BLI_sys_types.h" /********************************* Init **************************************/ diff --git a/source/blender/blenlib/BLI_math_rotation.h b/source/blender/blenlib/BLI_math_rotation.h index 1e56b80bcf2..b7ae35b2e23 100644 --- a/source/blender/blenlib/BLI_math_rotation.h +++ b/source/blender/blenlib/BLI_math_rotation.h @@ -27,6 +27,7 @@ * \ingroup bli */ +#include "BLI_utildefines.h" #include "DNA_vec_types.h" #ifdef __cplusplus diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index b9d2a89784b..6cfa2d2ced6 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -33,6 +33,7 @@ extern "C" { #include "BLI_compiler_attrs.h" #include "BLI_math_inline.h" +#include "BLI_utildefines.h" /************************************* Init ***********************************/ diff --git a/source/blender/blenlib/BLI_memory_utils_cxx.h b/source/blender/blenlib/BLI_memory_utils_cxx.h index f15621b4e41..35b08f804cb 100644 --- a/source/blender/blenlib/BLI_memory_utils_cxx.h +++ b/source/blender/blenlib/BLI_memory_utils_cxx.h @@ -24,6 +24,8 @@ #include <memory> #include <algorithm> +#include "BLI_utildefines.h" + namespace BLI { using std::copy; diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h index 67851a63f8f..6491180c2fd 100644 --- a/source/blender/blenlib/BLI_mempool.h +++ b/source/blender/blenlib/BLI_mempool.h @@ -29,6 +29,7 @@ extern "C" { #endif #include "BLI_compiler_attrs.h" +#include "BLI_utildefines.h" struct BLI_mempool; struct BLI_mempool_chunk; diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index d4e3ebdb2e1..4376aefdc25 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -28,6 +28,7 @@ extern "C" { #endif #include "BLI_compiler_attrs.h" +#include "BLI_utildefines.h" void BLI_setenv(const char *env, const char *val) ATTR_NONNULL(1); void BLI_setenv_if_new(const char *env, const char *val) ATTR_NONNULL(1); diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index cc91c26a2ab..7c8290439c6 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -32,7 +32,7 @@ extern "C" { #endif @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs