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>2012-12-04 18:43:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-12-04 18:43:42 +0400
commit767bfba808b82eb4dcf0d9f27c1a6dd428b1447f (patch)
tree8fad4e01b349621dab619c0f8e81fc4aa5f665ab /source/blender/blenkernel
parent41b6e700e09bd936227f1aec51f8cbfaf6ee864b (diff)
cmake was missing some header files.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/CMakeLists.txt14
-rw-r--r--source/blender/blenkernel/intern/constraint.c8
2 files changed, 8 insertions, 14 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c5dc7da8edf..2da9b402d59 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -255,13 +255,13 @@ if(WITH_BULLET)
add_definitions(-DUSE_BULLET)
endif()
-if(WITH_MOD_CLOTH_ELTOPO)
- list(APPEND INC
- ../../../extern/eltopo
- ../../../extern/eltopo/eltopo3d
- )
- add_definitions(-DWITH_ELTOPO)
-endif()
+#if(WITH_MOD_CLOTH_ELTOPO)
+# list(APPEND INC
+# ../../../extern/eltopo
+# ../../../extern/eltopo/eltopo3d
+# )
+# add_definitions(-DWITH_ELTOPO)
+#endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index e300b5e0f19..97d750854f4 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -84,15 +84,9 @@
#include "BKE_movieclip.h"
#ifdef WITH_PYTHON
-#include "BPY_extern.h"
+# include "BPY_extern.h"
#endif
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-
-
/* ************************ Constraints - General Utilities *************************** */
/* These functions here don't act on any specific constraints, and are therefore should/will
* not require any of the special function-pointers afforded by the relevant constraint