Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-03-19 11:33:03 +0300
committerDalai Felinto <dalai@blender.org>2020-03-19 11:33:58 +0300
commit2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch)
treeec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/nodes
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/composite/node_composite_tree.c2
-rw-r--r--source/blender/nodes/composite/node_composite_util.h4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_common.c2
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_cryptomatte.c2
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_image.c2
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_outputFile.c4
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_splitViewer.c2
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_viewer.c2
-rw-r--r--source/blender/nodes/intern/node_common.c4
-rw-r--r--source/blender/nodes/intern/node_socket.c2
-rw-r--r--source/blender/nodes/shader/node_shader_tree.c10
-rw-r--r--source/blender/nodes/shader/node_shader_util.h6
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_common.c2
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_valToRgb.c2
-rw-r--r--source/blender/nodes/texture/node_texture_tree.c6
-rw-r--r--source/blender/nodes/texture/node_texture_util.c2
-rw-r--r--source/blender/nodes/texture/node_texture_util.h8
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_at.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_bricks.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_checker.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_common.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_compose.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_coord.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_curves.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_decompose.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_distance.c4
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_hueSatVal.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_image.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_invert.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_math.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_mixRgb.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_output.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_proc.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_rotate.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_scale.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_texture.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_translate.c4
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_valToNor.c2
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_valToRgb.c4
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_viewer.c2
40 files changed, 57 insertions, 57 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index 8c224eb335f..a830f5f1bf9 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -24,8 +24,8 @@
#include <stdio.h>
#include "DNA_color_types.h"
-#include "DNA_scene_types.h"
#include "DNA_node_types.h"
+#include "DNA_scene_types.h"
#include "BLT_translation.h"
diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h
index c7785682865..4372ef78bc0 100644
--- a/source/blender/nodes/composite/node_composite_util.h
+++ b/source/blender/nodes/composite/node_composite_util.h
@@ -28,8 +28,8 @@
#include "DNA_movieclip_types.h"
#include "DNA_node_types.h"
-#include "BLI_math.h"
#include "BLI_blenlib.h"
+#include "BLI_math.h"
#include "BLT_translation.h"
@@ -41,8 +41,8 @@
#include "node_util.h"
-#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
#include "RE_pipeline.h"
diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c
index 0736496a24f..15637506e77 100644
--- a/source/blender/nodes/composite/nodes/node_composite_common.c
+++ b/source/blender/nodes/composite/nodes/node_composite_common.c
@@ -24,9 +24,9 @@
#include "DNA_node_types.h"
-#include "node_composite_util.h"
#include "NOD_common.h"
#include "node_common.h"
+#include "node_composite_util.h"
#include "BKE_node.h"
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
index dedede996cf..ce0c1a91072 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
@@ -21,11 +21,11 @@
* \ingroup cmpnodes
*/
-#include "node_composite_util.h"
#include "BLI_assert.h"
#include "BLI_dynstr.h"
#include "BLI_hash_mm3.h"
#include "BLI_utildefines.h"
+#include "node_composite_util.h"
/* this is taken from the cryptomatte specification 1.0 */
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 6b380bfb5af..cda142e1a8b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -23,8 +23,8 @@
#include "node_composite_util.h"
-#include "BLI_utildefines.h"
#include "BLI_linklist.h"
+#include "BLI_utildefines.h"
#include "DNA_scene_types.h"
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index af806a37341..4d23a4d2797 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -21,9 +21,9 @@
* \ingroup cmpnodes
*/
-#include <string.h>
-#include "BLI_utildefines.h"
#include "BLI_string_utils.h"
+#include "BLI_utildefines.h"
+#include <string.h>
#include "BKE_context.h"
diff --git a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
index 7a6ae3790d4..8afb3fd4841 100644
--- a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
@@ -23,8 +23,8 @@
#include "node_composite_util.h"
-#include "BKE_image.h"
#include "BKE_global.h"
+#include "BKE_image.h"
/* **************** SPLIT VIEWER ******************** */
static bNodeSocketTemplate cmp_node_splitviewer_in[] = {
diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.c b/source/blender/nodes/composite/nodes/node_composite_viewer.c
index 1bdf7a8ee7c..b5f74d5c937 100644
--- a/source/blender/nodes/composite/nodes/node_composite_viewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_viewer.c
@@ -23,8 +23,8 @@
#include "node_composite_util.h"
-#include "BKE_image.h"
#include "BKE_global.h"
+#include "BKE_image.h"
/* **************** VIEWER ******************** */
static bNodeSocketTemplate cmp_node_viewer_in[] = {
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 7886fcf4f4d..765fa84439f 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -21,8 +21,8 @@
* \ingroup nodes
*/
-#include <string.h>
#include <stddef.h>
+#include <string.h>
#include "DNA_node_types.h"
@@ -38,9 +38,9 @@
#include "MEM_guardedalloc.h"
+#include "NOD_common.h"
#include "node_common.h"
#include "node_util.h"
-#include "NOD_common.h"
enum {
REFINE_FORWARD = 1 << 0,
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 15e41d03583..199b469781d 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -27,8 +27,8 @@
#include "BLI_listbase.h"
#include "BLI_math.h"
-#include "BLI_utildefines.h"
#include "BLI_string.h"
+#include "BLI_utildefines.h"
#include "BKE_node.h"
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[] = {
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index 43deea9c2de..cf5d39847cf 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -23,9 +23,9 @@
#include <string.h>
-#include "DNA_texture_types.h"
#include "DNA_node_types.h"
#include "DNA_space_types.h"
+#include "DNA_texture_types.h"
#include "BLI_listbase.h"
#include "BLI_threads.h"
@@ -38,11 +38,11 @@
#include "BKE_node.h"
#include "BKE_paint.h"
+#include "NOD_texture.h"
#include "node_common.h"
#include "node_exec.h"
-#include "node_util.h"
-#include "NOD_texture.h"
#include "node_texture_util.h"
+#include "node_util.h"
#include "DEG_depsgraph.h"
diff --git a/source/blender/nodes/texture/node_texture_util.c b/source/blender/nodes/texture/node_texture_util.c
index 844a45f8d8b..1d7641753e0 100644
--- a/source/blender/nodes/texture/node_texture_util.c
+++ b/source/blender/nodes/texture/node_texture_util.c
@@ -37,8 +37,8 @@
* over other previous ones.
*/
-#include <assert.h>
#include "node_texture_util.h"
+#include <assert.h>
bool tex_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree)
{
diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h
index f638bdb0eec..b3407f68857 100644
--- a/source/blender/nodes/texture/node_texture_util.h
+++ b/source/blender/nodes/texture/node_texture_util.h
@@ -29,8 +29,8 @@
#include "MEM_guardedalloc.h"
-#include "DNA_color_types.h"
#include "DNA_ID.h"
+#include "DNA_color_types.h"
#include "DNA_image_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
@@ -38,8 +38,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"
@@ -53,13 +53,13 @@
#include "BKE_node.h"
#include "BKE_texture.h"
-#include "node_util.h"
#include "NOD_texture.h"
+#include "node_util.h"
#include "BLT_translation.h"
-#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
#include "RE_pipeline.h"
#include "RE_shader_ext.h"
diff --git a/source/blender/nodes/texture/nodes/node_texture_at.c b/source/blender/nodes/texture/nodes/node_texture_at.c
index 66fec2f3769..a6f8d28db75 100644
--- a/source/blender/nodes/texture/nodes/node_texture_at.c
+++ b/source/blender/nodes/texture/nodes/node_texture_at.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
static bNodeSocketTemplate inputs[] = {
{SOCK_RGBA, N_("Texture"), 0.0f, 0.0f, 0.0f, 1.0f},
diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c
index b2ebc722204..72690d6ccfe 100644
--- a/source/blender/nodes/texture/nodes/node_texture_bricks.c
+++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
#include <math.h>
diff --git a/source/blender/nodes/texture/nodes/node_texture_checker.c b/source/blender/nodes/texture/nodes/node_texture_checker.c
index 662a4cdeb20..e3c4d44e7f5 100644
--- a/source/blender/nodes/texture/nodes/node_texture_checker.c
+++ b/source/blender/nodes/texture/nodes/node_texture_checker.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
#include <math.h>
static bNodeSocketTemplate inputs[] = {
diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c
index a505bed2458..c83166f5ed6 100644
--- a/source/blender/nodes/texture/nodes/node_texture_common.c
+++ b/source/blender/nodes/texture/nodes/node_texture_common.c
@@ -28,10 +28,10 @@
#include "BKE_node.h"
-#include "node_texture_util.h"
#include "NOD_common.h"
#include "node_common.h"
#include "node_exec.h"
+#include "node_texture_util.h"
#include "RNA_access.h"
diff --git a/source/blender/nodes/texture/nodes/node_texture_compose.c b/source/blender/nodes/texture/nodes/node_texture_compose.c
index 6339dfa6afd..ffa0e9ae43e 100644
--- a/source/blender/nodes/texture/nodes/node_texture_compose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_compose.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
static bNodeSocketTemplate inputs[] = {
{SOCK_FLOAT, N_("Red"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_UNSIGNED},
diff --git a/source/blender/nodes/texture/nodes/node_texture_coord.c b/source/blender/nodes/texture/nodes/node_texture_coord.c
index d34aa36fefc..5a0cf5eb497 100644
--- a/source/blender/nodes/texture/nodes/node_texture_coord.c
+++ b/source/blender/nodes/texture/nodes/node_texture_coord.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
static bNodeSocketTemplate outputs[] = {
{SOCK_VECTOR, N_("Coordinates")},
diff --git a/source/blender/nodes/texture/nodes/node_texture_curves.c b/source/blender/nodes/texture/nodes/node_texture_curves.c
index 86141e1916f..d42985ba041 100644
--- a/source/blender/nodes/texture/nodes/node_texture_curves.c
+++ b/source/blender/nodes/texture/nodes/node_texture_curves.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
/* **************** CURVE Time ******************** */
diff --git a/source/blender/nodes/texture/nodes/node_texture_decompose.c b/source/blender/nodes/texture/nodes/node_texture_decompose.c
index 2a992837272..83922ea03ab 100644
--- a/source/blender/nodes/texture/nodes/node_texture_decompose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_decompose.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
#include <math.h>
static bNodeSocketTemplate inputs[] = {
diff --git a/source/blender/nodes/texture/nodes/node_texture_distance.c b/source/blender/nodes/texture/nodes/node_texture_distance.c
index 7673d74772e..489318514e5 100644
--- a/source/blender/nodes/texture/nodes/node_texture_distance.c
+++ b/source/blender/nodes/texture/nodes/node_texture_distance.c
@@ -21,10 +21,10 @@
* \ingroup texnodes
*/
-#include <math.h>
#include "BLI_math.h"
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
+#include <math.h>
static bNodeSocketTemplate inputs[] = {
{SOCK_VECTOR, N_("Coordinate 1"), 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_NONE},
diff --git a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
index 9490fbe79dd..759fb3d43d5 100644
--- a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
+++ b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
static bNodeSocketTemplate inputs[] = {
{SOCK_FLOAT, N_("Hue"), 0.0f, 0.0f, 0.0f, 0.0f, -0.5f, 0.5f, PROP_NONE},
diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c
index 035514bf486..0d10b3270d7 100644
--- a/source/blender/nodes/texture/nodes/node_texture_image.c
+++ b/source/blender/nodes/texture/nodes/node_texture_image.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
static bNodeSocketTemplate outputs[] = {
{SOCK_RGBA, N_("Image")},
diff --git a/source/blender/nodes/texture/nodes/node_texture_invert.c b/source/blender/nodes/texture/nodes/node_texture_invert.c
index 361f94d7228..5d3f86c5c9c 100644
--- a/source/blender/nodes/texture/nodes/node_texture_invert.c
+++ b/source/blender/nodes/texture/nodes/node_texture_invert.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
/* **************** INVERT ******************** */
static bNodeSocketTemplate inputs[] = {
diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index 334e3fef294..134a0ebb093 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
/* **************** SCALAR MATH ******************** */
static bNodeSocketTemplate inputs[] = {
diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
index e964aec86bb..b1aeb269018 100644
--- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
/* **************** MIX RGB ******************** */
static bNodeSocketTemplate inputs[] = {
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index ed5c872ee13..b24781e032b 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
/* **************** COMPOSITE ******************** */
static bNodeSocketTemplate inputs[] = {
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c
index ac6a5e6e845..bb7ee5f5bff 100644
--- a/source/blender/nodes/texture/nodes/node_texture_proc.c
+++ b/source/blender/nodes/texture/nodes/node_texture_proc.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
#include "RE_shader_ext.h"
diff --git a/source/blender/nodes/texture/nodes/node_texture_rotate.c b/source/blender/nodes/texture/nodes/node_texture_rotate.c
index c005aedceb8..825f9d56147 100644
--- a/source/blender/nodes/texture/nodes/node_texture_rotate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_rotate.c
@@ -23,8 +23,8 @@
#include <math.h>
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
static bNodeSocketTemplate inputs[] = {
{SOCK_RGBA, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
diff --git a/source/blender/nodes/texture/nodes/node_texture_scale.c b/source/blender/nodes/texture/nodes/node_texture_scale.c
index 57bfe4f42f8..d23b1b4d037 100644
--- a/source/blender/nodes/texture/nodes/node_texture_scale.c
+++ b/source/blender/nodes/texture/nodes/node_texture_scale.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include <math.h>
#include "node_texture_util.h"
+#include <math.h>
static bNodeSocketTemplate inputs[] = {
{SOCK_RGBA, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c
index 47c795907b6..9551a10ee57 100644
--- a/source/blender/nodes/texture/nodes/node_texture_texture.c
+++ b/source/blender/nodes/texture/nodes/node_texture_texture.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
#include "RE_shader_ext.h"
diff --git a/source/blender/nodes/texture/nodes/node_texture_translate.c b/source/blender/nodes/texture/nodes/node_texture_translate.c
index ae9ee60522a..2eef3132a18 100644
--- a/source/blender/nodes/texture/nodes/node_texture_translate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_translate.c
@@ -21,9 +21,9 @@
* \ingroup texnodes
*/
-#include <math.h>
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
+#include <math.h>
static bNodeSocketTemplate inputs[] = {
{SOCK_RGBA, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f},
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToNor.c b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
index 009c5c783b7..2fb04777848 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToNor.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
static bNodeSocketTemplate inputs[] = {
{SOCK_FLOAT, N_("Val"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
index 7aabae6feeb..8d365e13fc4 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
@@ -21,9 +21,9 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
-#include "NOD_texture.h"
#include "IMB_colormanagement.h"
+#include "NOD_texture.h"
+#include "node_texture_util.h"
/* **************** VALTORGB ******************** */
static bNodeSocketTemplate valtorgb_in[] = {
diff --git a/source/blender/nodes/texture/nodes/node_texture_viewer.c b/source/blender/nodes/texture/nodes/node_texture_viewer.c
index 9f05f7ab70f..c96ff2062cb 100644
--- a/source/blender/nodes/texture/nodes/node_texture_viewer.c
+++ b/source/blender/nodes/texture/nodes/node_texture_viewer.c
@@ -21,8 +21,8 @@
* \ingroup texnodes
*/
-#include "node_texture_util.h"
#include "NOD_texture.h"
+#include "node_texture_util.h"
#include <math.h>
static bNodeSocketTemplate inputs[] = {