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
path: root/extern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-02-17 21:34:16 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-17 21:34:16 +0400
commit2fce23c99a91590e810d74294f16ad210f9cb896 (patch)
tree9fedeea8e7bb9ac72d27ef062399bdc8ee034154 /extern
parentea6d0b7a3ba36ecfed02078967800a214dccbd9c (diff)
Returning magic _USE_MATH_DEFINES to esm tracker.
Needed to make constants like M_E defined in msvc. Was occasionally removed on moving main changes in libmv from patch files in blender repo to won repo (rev44190).
Diffstat (limited to 'extern')
-rw-r--r--extern/libmv/ChangeLog26
-rw-r--r--extern/libmv/libmv/tracking/esm_region_tracker.cc3
2 files changed, 17 insertions, 12 deletions
diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog
index 522ae5cd809..f49a07de350 100644
--- a/extern/libmv/ChangeLog
+++ b/extern/libmv/ChangeLog
@@ -1,3 +1,17 @@
+commit 75b9af405964ff2c7d3f0a44500e27e63b37c91b
+Author: Sergey Sharybin <sergey.vfx@gmail.com>
+Date: Fri Feb 17 23:29:11 2012 +0600
+
+ _USE_MATH_DEFINES is needed to define constants like M_E when building with msvc
+ Occasionally was removed, but now added comment about this so hopefully it
+ wouldn't removed again.
+
+commit f85b1232a9b929f69443b5eed6e7a39908cd6551
+Author: Sergey Sharybin <sergey.vfx@gmail.com>
+Date: Fri Feb 17 21:34:40 2012 +0600
+
+ Picky edit: corrected mode for ssba readme file.
+
commit f8c2b223f01551fd81a85f6d5221646165147035
Author: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri Feb 17 21:32:05 2012 +0600
@@ -433,15 +447,3 @@ Author: Matthias Fauconneau <matthias.fauconneau@gmail.com>
Date: Thu Aug 18 20:51:43 2011 +0200
Fix detect.cc.
-
-commit ec18cc5ea9ae2e641075a847e82d0aacb8415ad8
-Author: Matthias Fauconneau <matthias.fauconneau@gmail.com>
-Date: Thu Aug 18 17:45:37 2011 +0200
-
- Compute and return Pearson product-moment correlation coefficient between reference and matched pattern.
-
-commit 21d4245c63a01bfc736192d55baf10983e7c9ec7
-Author: Matthias Fauconneau <matthias.fauconneau@gmail.com>
-Date: Thu Aug 18 16:18:44 2011 +0200
-
- UI and API support for affine tracking.
diff --git a/extern/libmv/libmv/tracking/esm_region_tracker.cc b/extern/libmv/libmv/tracking/esm_region_tracker.cc
index 5ee3950bd71..df9c89a46d4 100644
--- a/extern/libmv/libmv/tracking/esm_region_tracker.cc
+++ b/extern/libmv/libmv/tracking/esm_region_tracker.cc
@@ -18,6 +18,9 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
+/* needed for M_E when building with msvc */
+#define _USE_MATH_DEFINES
+
#include "libmv/tracking/esm_region_tracker.h"
#include "libmv/logging/logging.h"