[Bf-blender-cvs] [b91ac86cfcc] master: Cleanup: Remove unnecessary generic includes from headers

Hans Goudey noreply at git.blender.org
Mon Dec 6 22:04:22 CET 2021


Commit: b91ac86cfcc83d891fc344ddf205218a0c4dabe6
Author: Hans Goudey
Date:   Mon Dec 6 16:04:14 2021 -0500
Branches: master
https://developer.blender.org/rBb91ac86cfcc83d891fc344ddf205218a0c4dabe6

Cleanup: Remove unnecessary generic includes from headers

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

M	source/blender/editors/space_node/node_draw.cc
M	source/blender/editors/space_node/node_relationships.cc
M	source/blender/nodes/composite/node_composite_util.hh
M	source/blender/nodes/composite/nodes/node_composite_outputFile.cc
M	source/blender/nodes/shader/node_shader_util.hh
M	source/blender/nodes/texture/node_texture_util.h
M	source/blender/nodes/texture/nodes/node_texture_bricks.c
M	source/blender/nodes/texture/nodes/node_texture_output.c

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

diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc
index d9fa63de08f..0e6d5a81a8b 100644
--- a/source/blender/editors/space_node/node_draw.cc
+++ b/source/blender/editors/space_node/node_draw.cc
@@ -35,7 +35,6 @@
 #include "DNA_texture_types.h"
 #include "DNA_world_types.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_map.hh"
 #include "BLI_math.h"
 #include "BLI_set.hh"
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index fa147f56345..a4873b356a3 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -26,9 +26,7 @@
 #include "DNA_anim_types.h"
 #include "DNA_node_types.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_easing.h"
-#include "BLI_math.h"
 
 #include "BKE_anim_data.h"
 #include "BKE_context.h"
diff --git a/source/blender/nodes/composite/node_composite_util.hh b/source/blender/nodes/composite/node_composite_util.hh
index 6fd82ffc93f..63576d4109f 100644
--- a/source/blender/nodes/composite/node_composite_util.hh
+++ b/source/blender/nodes/composite/node_composite_util.hh
@@ -27,9 +27,6 @@
 #include "DNA_movieclip_types.h"
 #include "DNA_node_types.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
 #include "BLT_translation.h"
 
 #include "BKE_colorband.h"
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.cc b/source/blender/nodes/composite/nodes/node_composite_outputFile.cc
index f02a0b2fa21..6a1b83f657e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.cc
@@ -21,9 +21,11 @@
  * \ingroup cmpnodes
  */
 
+#include <cstring>
+
+#include "BLI_string_utf8.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
-#include <cstring>
 
 #include "BKE_context.h"
 
diff --git a/source/blender/nodes/shader/node_shader_util.hh b/source/blender/nodes/shader/node_shader_util.hh
index 3a4519b00af..5edc6653c68 100644
--- a/source/blender/nodes/shader/node_shader_util.hh
+++ b/source/blender/nodes/shader/node_shader_util.hh
@@ -39,10 +39,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_color.hh"
 #include "BLI_float3.hh"
-#include "BLI_math.h"
 #include "BLI_math_base_safe.h"
 #include "BLI_rand.h"
 #include "BLI_threads.h"
diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h
index 8f63a1ad07d..84d2c5c903a 100644
--- a/source/blender/nodes/texture/node_texture_util.h
+++ b/source/blender/nodes/texture/node_texture_util.h
@@ -37,8 +37,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_math_vector.h"
 #include "BLI_rand.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c
index 72690d6ccfe..966d05b4a16 100644
--- a/source/blender/nodes/texture/nodes/node_texture_bricks.c
+++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c
@@ -21,6 +21,7 @@
  * \ingroup texnodes
  */
 
+
 #include "NOD_texture.h"
 #include "node_texture_util.h"
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index 9145df0038b..19e24c9f82a 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -21,6 +21,8 @@
  * \ingroup texnodes
  */
 
+#include "BLI_string.h"
+
 #include "NOD_texture.h"
 #include "node_texture_util.h"



More information about the Bf-blender-cvs mailing list