diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-03 14:04:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-03 14:04:16 +0400 |
commit | 0298d223cc1156df3a32fbb3a97dccf5ddb5ad02 (patch) | |
tree | 437798c6e1ae0541bd7169072d2c5a5e276a40c7 /source/blender/nodes | |
parent | 744a3b9cb26a734487264eec3e9e6dacb28daa73 (diff) |
quiet various warnings, also disable -Wdouble-promotion with cmake since it gives warnings with variable length args.
Diffstat (limited to 'source/blender/nodes')
21 files changed, 30 insertions, 7 deletions
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_at.c b/source/blender/nodes/intern/TEX_nodes/TEX_at.c index c66935c1ab8..d5980b786b0 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_at.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_at.c @@ -31,7 +31,8 @@ */ -#include "../TEX_util.h" +#include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType inputs[]= { { SOCK_RGBA, 1, "Texture", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f }, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c b/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c index fe9b7cfadb8..0eb982496a9 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c @@ -31,7 +31,9 @@ */ -#include "../TEX_util.h" +#include "../TEX_util.h" +#include "TEX_node.h" + #include <math.h> static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_checker.c b/source/blender/nodes/intern/TEX_nodes/TEX_checker.c index 305d7094f57..c6c25ba1a8a 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_checker.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_checker.c @@ -31,7 +31,8 @@ */ -#include "../TEX_util.h" +#include "../TEX_util.h" +#include "TEX_node.h" #include <math.h> static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_compose.c b/source/blender/nodes/intern/TEX_nodes/TEX_compose.c index bde78e72399..6eae78ec3de 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_compose.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_compose.c @@ -31,7 +31,8 @@ */ -#include "../TEX_util.h" +#include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType inputs[]= { { SOCK_VALUE, 1, "Red", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_coord.c b/source/blender/nodes/intern/TEX_nodes/TEX_coord.c index c43aa9e4f32..3c46971f0d4 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_coord.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_coord.c @@ -32,6 +32,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType outputs[]= { { SOCK_VECTOR, 0, "Coordinates", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f }, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_curves.c b/source/blender/nodes/intern/TEX_nodes/TEX_curves.c index 0eb3927f9a8..e388efd17c0 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_curves.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_curves.c @@ -32,6 +32,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" /* **************** CURVE Time ******************** */ diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c b/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c index 1da9b6c681d..f27d8c98716 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c @@ -31,7 +31,8 @@ */ -#include "../TEX_util.h" +#include "../TEX_util.h" +#include "TEX_node.h" #include <math.h> static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_distance.c b/source/blender/nodes/intern/TEX_nodes/TEX_distance.c index 5f61a9e8045..b460844ba4a 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_distance.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_distance.c @@ -34,6 +34,7 @@ #include <math.h> #include "BLI_math.h" #include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType inputs[]= { { SOCK_VECTOR, 1, "Coordinate 1", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f }, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c b/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c index 70c5d25e1eb..471d8db2c03 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c @@ -32,6 +32,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_image.c b/source/blender/nodes/intern/TEX_nodes/TEX_image.c index 59144d60b6f..fcb18ab3342 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_image.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_image.c @@ -33,6 +33,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType outputs[]= { { SOCK_RGBA, 0, "Image", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_invert.c b/source/blender/nodes/intern/TEX_nodes/TEX_invert.c index bfee670a8ae..e908bdcff07 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_invert.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_invert.c @@ -32,6 +32,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" /* **************** INVERT ******************** */ static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_math.c b/source/blender/nodes/intern/TEX_nodes/TEX_math.c index 1652ba10e48..e00781741a0 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_math.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_math.c @@ -32,7 +32,7 @@ #include "../TEX_util.h" - +#include "TEX_node.h" /* **************** SCALAR MATH ******************** */ diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c b/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c index 44cec5d670d..c7668c27b99 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c @@ -32,6 +32,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" /* **************** MIX RGB ******************** */ static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_output.c b/source/blender/nodes/intern/TEX_nodes/TEX_output.c index 30b5aee7832..046ad724507 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_output.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_output.c @@ -32,6 +32,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" /* **************** COMPOSITE ******************** */ static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_proc.c b/source/blender/nodes/intern/TEX_nodes/TEX_proc.c index 58de1fd19e5..294c1f7322f 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_proc.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_proc.c @@ -32,6 +32,8 @@ #include "../TEX_util.h" +#include "TEX_node.h" + #include "RE_shader_ext.h" /* diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c index 8f7793ddaaf..1be6152a2b3 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c @@ -34,6 +34,7 @@ #include <math.h> #include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType inputs[]= { { SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c index 7b8a52d1923..d4d77b5fd5a 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_texture.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_texture.c @@ -32,6 +32,8 @@ #include "../TEX_util.h" +#include "TEX_node.h" + #include "RE_shader_ext.h" static bNodeSocketType inputs[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_translate.c b/source/blender/nodes/intern/TEX_nodes/TEX_translate.c index a8fdae69244..8f7d6d837d7 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_translate.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_translate.c @@ -33,6 +33,7 @@ #include <math.h> #include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType inputs[]= { { SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c b/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c index 65b96f16adc..e430c0c9a95 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c @@ -32,6 +32,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" static bNodeSocketType inputs[]= { { SOCK_VALUE, 1, "Val", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f }, diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c b/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c index 867b6be083e..19fa6c67c09 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c @@ -33,6 +33,7 @@ #include "../TEX_util.h" +#include "TEX_node.h" /* **************** VALTORGB ******************** */ static bNodeSocketType valtorgb_in[]= { diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c b/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c index 3deedf16f03..e917e525e17 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c @@ -31,7 +31,8 @@ */ -#include "../TEX_util.h" +#include "../TEX_util.h" +#include "TEX_node.h" #include <math.h> static bNodeSocketType inputs[]= { |