[Bf-blender-cvs] [8555595] master: Fixes for compilation with msvc

Sergey Sharybin noreply at git.blender.org
Wed Dec 10 09:40:15 CET 2014


Commit: 8555595d172a4051a0be3557bfd009299578d52a
Author: Sergey Sharybin
Date:   Wed Dec 10 13:11:48 2014 +0500
Branches: master
https://developer.blender.org/rB8555595d172a4051a0be3557bfd009299578d52a

Fixes for compilation with msvc

MSVC doesn't like caling macro argument f when using float values
in the macro, it simply replaces the f in the float value with the
argument..

CMake compilation still fails because of 77785ce70807, numpy is never
getting unpacked.

===================================================================

M	source/blender/blenlib/intern/polyfill2d_beautify.c

===================================================================

diff --git a/source/blender/blenlib/intern/polyfill2d_beautify.c b/source/blender/blenlib/intern/polyfill2d_beautify.c
index 5bbdbeb..c67fe44 100644
--- a/source/blender/blenlib/intern/polyfill2d_beautify.c
+++ b/source/blender/blenlib/intern/polyfill2d_beautify.c
@@ -178,7 +178,7 @@ static float quad_v2_rotate_beauty_calc(
 
 			float len_12, len_23, len_34, len_41, len_24, len_13;
 
-#define AREA_FROM_CROSS(f) (fabsf(f) / 2.0f)
+#define AREA_FROM_CROSS(val) (fabsf(val) / 2.0f)
 
 			/* edges around the quad */
 			len_12 = len_v2v2(v1, v2);




More information about the Bf-blender-cvs mailing list