[Bf-blender-cvs] [4f1abcb06f9] master: Cleanup: remove redundant headers

Campbell Barton noreply at git.blender.org
Mon Dec 16 22:59:11 CET 2019


Commit: 4f1abcb06f94be97d2e2ca44c7799fb2cdc4369c
Author: Campbell Barton
Date:   Tue Dec 17 08:57:06 2019 +1100
Branches: master
https://developer.blender.org/rB4f1abcb06f94be97d2e2ca44c7799fb2cdc4369c

Cleanup: remove redundant headers

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

M	source/blender/blenkernel/intern/fluid.c

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 1b4b81c6f5f..b076be7fd91 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -21,68 +21,59 @@
  * \ingroup bke
  */
 
-#include "MEM_guardedalloc.h"
-
-#include <float.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h> /* memset */
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_kdopbvh.h"
-#include "BLI_threads.h"
-#include "BLI_utildefines.h"
-
-#include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_customdata_types.h"
-#include "DNA_light_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_particle_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_fluid_types.h"
-
-#include "BKE_appdir.h"
-#include "BKE_animsys.h"
-#include "BKE_armature.h"
-#include "BKE_bvhutils.h"
-#include "BKE_collision.h"
-#include "BKE_colortools.h"
-#include "BKE_constraint.h"
-#include "BKE_customdata.h"
-#include "BKE_deform.h"
-#include "BKE_effect.h"
-#include "BKE_library.h"
-#include "BKE_mesh.h"
-#include "BKE_mesh_runtime.h"
-#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_fluid.h"
-#include "BKE_texture.h"
-
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
-
-#include "RE_shader_ext.h"
-
-#include "GPU_glew.h"
-
-#include "manta_fluid_API.h"
-
-#include "BLI_task.h"
-#include "BLI_kdtree.h"
-#include "BLI_voxel.h"
-
 #ifdef WITH_FLUID
 
+#  include "MEM_guardedalloc.h"
+
+#  include <float.h>
+#  include <math.h>
+#  include <stdio.h>
+#  include <string.h> /* memset */
+
+#  include "BLI_blenlib.h"
+#  include "BLI_math.h"
+#  include "BLI_kdopbvh.h"
+#  include "BLI_threads.h"
+#  include "BLI_utildefines.h"
+
+#  include "DNA_customdata_types.h"
+#  include "DNA_light_types.h"
+#  include "DNA_mesh_types.h"
+#  include "DNA_meshdata_types.h"
+#  include "DNA_modifier_types.h"
+#  include "DNA_object_types.h"
+#  include "DNA_particle_types.h"
+#  include "DNA_scene_types.h"
+#  include "DNA_fluid_types.h"
+
+#  include "BKE_bvhutils.h"
+#  include "BKE_collision.h"
+#  include "BKE_colortools.h"
+#  include "BKE_customdata.h"
+#  include "BKE_deform.h"
+#  include "BKE_effect.h"
+#  include "BKE_library.h"
+#  include "BKE_mesh.h"
+#  include "BKE_mesh_runtime.h"
+#  include "BKE_modifier.h"
+#  include "BKE_object.h"
+#  include "BKE_particle.h"
+#  include "BKE_pointcache.h"
+#  include "BKE_scene.h"
+#  include "BKE_fluid.h"
+#  include "BKE_texture.h"
+
+#  include "DEG_depsgraph.h"
+#  include "DEG_depsgraph_query.h"
+
+#  include "RE_shader_ext.h"
+
+#  include "manta_fluid_API.h"
+
+#  include "BLI_task.h"
+#  include "BLI_kdtree.h"
+#  include "BLI_voxel.h"
+
 // #define DEBUG_PRINT
 
 static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER;



More information about the Bf-blender-cvs mailing list