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:
authorRay Molenkamp <github@lazydodo.com>2019-11-08 19:01:00 +0300
committerRay Molenkamp <github@lazydodo.com>2019-11-08 19:01:00 +0300
commita67aa11b12ec27a1abb9badb513a516c8d90daf5 (patch)
tree19bb438d8ec845427968f30240c8c846eca156bf /source/blender/blenlib/intern/expr_pylike_eval.c
parente408a62c2a4b1bec44be06b533b20ce9822d92f2 (diff)
Windows: Switch to the dynamic C runtime
This change switches windows to the dynamic C runtime avoiding issues coming from mixing the static and dynamic runtime like the ones outlined in [1] [1] https://developer.blender.org/D5387#122165 Differential Revision: https://developer.blender.org/D6175 Reviewed by: @Sergey
Diffstat (limited to 'source/blender/blenlib/intern/expr_pylike_eval.c')
-rw-r--r--source/blender/blenlib/intern/expr_pylike_eval.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/expr_pylike_eval.c b/source/blender/blenlib/intern/expr_pylike_eval.c
index c7631f8991e..43923ce8c98 100644
--- a/source/blender/blenlib/intern/expr_pylike_eval.c
+++ b/source/blender/blenlib/intern/expr_pylike_eval.c
@@ -357,6 +357,13 @@ typedef struct BuiltinOpDef {
void *funcptr;
} BuiltinOpDef;
+#ifdef _MSC_VER
+/* Prevent MSVC from inlining calls to ceil/floor so the table below can get a function pointer to
+ * them. */
+# pragma function(ceil)
+# pragma function(floor)
+#endif
+
static BuiltinOpDef builtin_ops[] = {
{"radians", OPCODE_FUNC1, op_radians},
{"degrees", OPCODE_FUNC1, op_degrees},