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:
authorKent Mein <mein@cs.umn.edu>2002-11-25 18:29:57 +0300
committerKent Mein <mein@cs.umn.edu>2002-11-25 18:29:57 +0300
commit209a2ede2cdeade0d543969e7b2ff62fee84b43e (patch)
tree28484297290b14033587b3704535db4a0bb06c71 /source/blender
parentd0e346d544cd3abb0007a68137b31923020f7aeb (diff)
Last of the config.h mods...
#ifdef HAVE_CONFIG_H #include <config.h> #endif added to these files. Kent -- mein@cs.umn.edu
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/img/intern/IMG_Api.cpp4
-rw-r--r--source/blender/img/intern/IMG_BrushRGBA32.cpp5
-rw-r--r--source/blender/img/intern/IMG_CanvasRGBA32.cpp4
-rw-r--r--source/blender/img/intern/IMG_Line.cpp4
-rw-r--r--source/blender/img/intern/IMG_Pixmap.cpp7
-rw-r--r--source/blender/img/intern/IMG_PixmapRGBA32.cpp4
-rw-r--r--source/blender/img/intern/IMG_Rect.cpp3
-rw-r--r--source/blender/render/intern/source/RE_DummyShadowBuffer.cpp8
-rw-r--r--source/blender/render/intern/source/RE_basicShadowBuffer.cpp7
-rw-r--r--source/blender/render/intern/source/shadowBuffer.cpp6
10 files changed, 37 insertions, 15 deletions
diff --git a/source/blender/img/intern/IMG_Api.cpp b/source/blender/img/intern/IMG_Api.cpp
index 1be8b294c28..95f7204c525 100644
--- a/source/blender/img/intern/IMG_Api.cpp
+++ b/source/blender/img/intern/IMG_Api.cpp
@@ -30,10 +30,12 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
#include "../IMG_Api.h"
-
#include "IMG_BrushRGBA32.h"
#include "IMG_CanvasRGBA32.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
IMG_BrushPtr IMG_BrushCreate(unsigned int w, unsigned int h, float r, float g, float b, float a)
{
diff --git a/source/blender/img/intern/IMG_BrushRGBA32.cpp b/source/blender/img/intern/IMG_BrushRGBA32.cpp
index 7c78e98a8cf..72e1c57ef63 100644
--- a/source/blender/img/intern/IMG_BrushRGBA32.cpp
+++ b/source/blender/img/intern/IMG_BrushRGBA32.cpp
@@ -30,10 +30,11 @@
*/
#include "IMG_BrushRGBA32.h"
-
-
#include <math.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
IMG_BrushRGBA32::IMG_BrushRGBA32(TUns32 w, TUns32 h, const IMG_ColorRGB& c, float a)
: IMG_PixmapRGBA32(w, h), m_color(c), m_alpha(a)
diff --git a/source/blender/img/intern/IMG_CanvasRGBA32.cpp b/source/blender/img/intern/IMG_CanvasRGBA32.cpp
index 5358265337d..2fd5e276298 100644
--- a/source/blender/img/intern/IMG_CanvasRGBA32.cpp
+++ b/source/blender/img/intern/IMG_CanvasRGBA32.cpp
@@ -31,7 +31,9 @@
#include "IMG_CanvasRGBA32.h"
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
IMG_CanvasRGBA32::IMG_CanvasRGBA32(TUns32 width, TUns32 height)
: IMG_PixmapRGBA32(width, height)
diff --git a/source/blender/img/intern/IMG_Line.cpp b/source/blender/img/intern/IMG_Line.cpp
index 2b864a63705..4fb4fb83ca4 100644
--- a/source/blender/img/intern/IMG_Line.cpp
+++ b/source/blender/img/intern/IMG_Line.cpp
@@ -31,3 +31,7 @@
*/
#include "IMG_Line.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
diff --git a/source/blender/img/intern/IMG_Pixmap.cpp b/source/blender/img/intern/IMG_Pixmap.cpp
index fa2176d299c..dba2fddb4dd 100644
--- a/source/blender/img/intern/IMG_Pixmap.cpp
+++ b/source/blender/img/intern/IMG_Pixmap.cpp
@@ -31,8 +31,9 @@
#include "IMG_Pixmap.h"
-
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
IMG_Pixmap::IMG_Pixmap()
{
@@ -56,4 +57,4 @@ IMG_Pixmap::IMG_Pixmap()
IMG_Pixmap::~IMG_Pixmap()
{
-} \ No newline at end of file
+}
diff --git a/source/blender/img/intern/IMG_PixmapRGBA32.cpp b/source/blender/img/intern/IMG_PixmapRGBA32.cpp
index 7ef716643b7..5ff647cd8ab 100644
--- a/source/blender/img/intern/IMG_PixmapRGBA32.cpp
+++ b/source/blender/img/intern/IMG_PixmapRGBA32.cpp
@@ -31,7 +31,9 @@
#include "IMG_PixmapRGBA32.h"
-
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
IMG_PixmapRGBA32::IMG_PixmapRGBA32(TUns32 width, TUns32 height)
: IMG_Pixmap(), m_mem(width * height)
diff --git a/source/blender/img/intern/IMG_Rect.cpp b/source/blender/img/intern/IMG_Rect.cpp
index 67357712708..c2e7bfc89c6 100644
--- a/source/blender/img/intern/IMG_Rect.cpp
+++ b/source/blender/img/intern/IMG_Rect.cpp
@@ -31,6 +31,9 @@
#include "IMG_Rect.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
TVisibility IMG_Rect::getVisibility(IMG_Rect& r) const
{
diff --git a/source/blender/render/intern/source/RE_DummyShadowBuffer.cpp b/source/blender/render/intern/source/RE_DummyShadowBuffer.cpp
index e2adefc05f2..02858cba717 100644
--- a/source/blender/render/intern/source/RE_DummyShadowBuffer.cpp
+++ b/source/blender/render/intern/source/RE_DummyShadowBuffer.cpp
@@ -30,11 +30,13 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-// #include <iostream.h>
-
#include "render_intern.h"
-
#include "RE_DummyShadowBuffer.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
struct LampRen;
RE_DummyShadowBuffer::RE_DummyShadowBuffer(void)
diff --git a/source/blender/render/intern/source/RE_basicShadowBuffer.cpp b/source/blender/render/intern/source/RE_basicShadowBuffer.cpp
index e126a755c35..17feea283dc 100644
--- a/source/blender/render/intern/source/RE_basicShadowBuffer.cpp
+++ b/source/blender/render/intern/source/RE_basicShadowBuffer.cpp
@@ -32,8 +32,6 @@
#include <math.h>
#include <string.h>
-
-//#include <iostream.h>
#include "MEM_guardedalloc.h"
#include "BLI_arithb.h"
@@ -49,6 +47,11 @@
/* own include */
#include "RE_basicShadowBuffer.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
/* crud */
#define MIN2(x,y) ( (x)<(y) ? (x) : (y) )
/* ------------------------------------------------------------------------- */
diff --git a/source/blender/render/intern/source/shadowBuffer.cpp b/source/blender/render/intern/source/shadowBuffer.cpp
index 76668f4e9ac..b60f7e160eb 100644
--- a/source/blender/render/intern/source/shadowBuffer.cpp
+++ b/source/blender/render/intern/source/shadowBuffer.cpp
@@ -31,8 +31,6 @@
*/
#include <assert.h>
-//#include <iostream.h>
-
#include "render.h"
#include "render_intern.h"
#include "shadbuf.h"
@@ -41,6 +39,10 @@
#include "RE_DummyShadowBuffer.h" /* A dummy shadow buffer */
#include "RE_basicShadowBuffer.h" /* the 'old' shadow buffer */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
struct ShadBuf;
struct LampRen;
struct Lamp;