diff options
Diffstat (limited to 'source/blender/nodes/shader')
4 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 12763390506..983386cc380 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -24,27 +24,27 @@ #include <string.h> #include "DNA_light_types.h" +#include "DNA_linestyle_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_world_types.h" -#include "DNA_linestyle_types.h" #include "DNA_workspace_types.h" +#include "DNA_world_types.h" +#include "BLI_alloca.h" #include "BLI_linklist.h" #include "BLI_listbase.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_alloca.h" #include "BLT_translation.h" #include "BKE_context.h" +#include "BKE_lib_id.h" #include "BKE_linestyle.h" #include "BKE_node.h" #include "BKE_scene.h" -#include "BKE_lib_id.h" #include "RNA_access.h" @@ -56,8 +56,8 @@ #include "node_common.h" #include "node_exec.h" -#include "node_util.h" #include "node_shader_util.h" +#include "node_util.h" typedef struct nTreeTags { float ssr_id, sss_id; diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index 9719d0b36f5..8d525c8f23c 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -24,15 +24,15 @@ #ifndef __NODE_SHADER_UTIL_H__ #define __NODE_SHADER_UTIL_H__ -#include <math.h> #include <float.h> +#include <math.h> #include <string.h> #include "MEM_guardedalloc.h" +#include "DNA_ID.h" #include "DNA_color_types.h" #include "DNA_customdata_types.h" -#include "DNA_ID.h" #include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_node_types.h" @@ -40,8 +40,8 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_rand.h" #include "BLI_threads.h" #include "BLI_utildefines.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c index 257caabcabf..0ecb64cd1d1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_common.c +++ b/source/blender/nodes/shader/nodes/node_shader_common.c @@ -28,10 +28,10 @@ #include "BKE_node.h" -#include "node_shader_util.h" #include "NOD_common.h" #include "node_common.h" #include "node_exec.h" +#include "node_shader_util.h" #include "RNA_access.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c index 56cd52705ab..49f9befdce3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c +++ b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c @@ -21,8 +21,8 @@ * \ingroup shdnodes */ -#include "node_shader_util.h" #include "IMB_colormanagement.h" +#include "node_shader_util.h" /* **************** VALTORGB ******************** */ static bNodeSocketTemplate sh_node_valtorgb_in[] = { |