cmake was missing some header files.

diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 38be34add75b9d5e4c47191634dba03b46161522..ebc5953d9567d4fe1d1ed1b24f8b747180a1de92 100644 (file)
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -102,6 +102,8 @@ set(SRC
        libmv/multiview/conditioning.h
        libmv/multiview/euclidean_resection.h
        libmv/multiview/fundamental.h
+       libmv/multiview/homography.h
+       libmv/multiview/homography_parameterization.h
        libmv/multiview/nviewtriangulation.h
        libmv/multiview/projection.h
        libmv/multiview/resection.h
@@ -131,6 +133,7 @@ set(SRC
        libmv/tracking/pyramid_region_tracker.h
        libmv/tracking/region_tracker.h
        libmv/tracking/retrack_region_tracker.h
+       libmv/tracking/track_region.h
        libmv/tracking/trklt_region_tracker.h
 
        third_party/fast/fast.h

diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index bf5f791a245fd790cf0dfc7fe2045c085a205d59..dce417704cc988af4689d430b0a8159dd73fc0a7 100644 (file)
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -54,6 +54,7 @@ set(SRC_HEADERS
        util_path.h
        util_progress.h
        util_set.h
+       util_stats.h
        util_string.h
        util_system.h
        util_task.h
@@ -61,8 +62,8 @@ set(SRC_HEADERS
        util_time.h
        util_transform.h
        util_types.h
-       util_view.h
        util_vector.h
+       util_view.h
        util_xml.h
 )
 

diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt
index 3187639c844b0837f974324b55f752a5cafde669..1f14a0e7a6a11c6bcd7a5052e21ae8afd6c6c4e0 100644 (file)
--- a/intern/locale/CMakeLists.txt
+++ b/intern/locale/CMakeLists.txt
@@ -32,6 +32,8 @@ set(INC_SYS
 
 set(SRC
        boost_locale_wrapper.cpp
+
+       boost_locale_wrapper.h
 )
 
 if(WITH_INTERNATIONAL)

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c5dc7da8edf2b8648e09e734abd7d25d51103ea6..2da9b402d59245f2f0ccddbc19df2a56e350b3a4 100644 (file)
--- 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 e300b5e0f19996d2119f15fe1ac7efba2bceb06b..97d750854f4e54a31bf69d0985e20176c929b69a 100644 (file)
--- 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 

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 10ae26d3757371dbf9cdd636fb004b17f0dc1da9..8a3b1c9675b05c03cd7808fb881d8588dda4c87c 100644 (file)
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -128,6 +128,7 @@ set(SRC
        BLI_math_color.h
        BLI_math_geom.h
        BLI_math_inline.h
+       BLI_math_interp.h
        BLI_math_matrix.h
        BLI_math_rotation.h
        BLI_math_vector.h

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index f886b52e2ce645c51017fd474ff32772ec3b4b92..0988a196fb1610f2cdbd374f3910b63317019873 100644 (file)
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -643,8 +643,8 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
 
                        /* apply transformation of previous parenting */
                        if (keep_transform) {
-                                /* was removed because of bug [#23577],
-                                 * but this can be handy in some cases too [#32616], so make optional */
+                               /* was removed because of bug [#23577],
+                                * but this can be handy in some cases too [#32616], so make optional */
                                BKE_object_apply_mat4(ob, ob->obmat, FALSE, FALSE);
                        }