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:
authorCampbell Barton <ideasman42@gmail.com>2014-05-01 01:21:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-01 01:21:08 +0400
commitaf86b008b2a3dacc33b4987c50d8ffa24f6f9817 (patch)
tree854b272c1196f704c11f0ca7f4c5eb024b2f8576 /source/blender/editors
parentcb48c0ceeaf368ef2a13639b68241cdfede62806 (diff)
Include removal gave problems with windows, ifdef some back in for windows only
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_style.c3
-rw-r--r--source/blender/editors/screen/area.c4
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c4
-rw-r--r--source/blender/editors/space_view3d/view3d_ops.c4
4 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index bbdfd1dcbae..fa31c20eb74 100644
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -55,6 +55,9 @@
#include "interface_intern.h"
+#ifdef WIN32
+# include "BLI_math_base.h" /* M_PI */
+#endif
/* style + theme + layout-engine = UI */
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 151764dab6a..05659f60578 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -68,6 +68,10 @@
#include "screen_intern.h"
+#ifdef WIN32
+# include "BLI_alloca.h"
+#endif
+
extern void ui_draw_anti_tria(float x1, float y1, float x2, float y2, float x3, float y3); /* xxx temp */
/* general area and region code */
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index bfa0dcd1c8c..76a0839d2d6 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -77,6 +77,10 @@
#include "outliner_intern.h"
+#ifdef WIN32
+# include "BLI_math_base.h" /* M_PI */
+#endif
+
/* ********************************************************* */
/* Persistent Data */
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index 4fa995b8799..a8128ba7ae8 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -57,6 +57,10 @@
#include "view3d_intern.h"
+#ifdef WIN32
+# include "BLI_math_base.h" /* M_PI */
+#endif
+
/* ************************** copy paste ***************************** */
static int view3d_copybuffer_exec(bContext *C, wmOperator *op)