diff options
author | Joshua Leung <aligorith@gmail.com> | 2013-09-01 09:55:50 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2013-09-01 09:55:50 +0400 |
commit | 3c193c825becab6a2baa72f63c9c5f242e15ecc5 (patch) | |
tree | af48eabaed9efb461b7967e58ae12861ff82ee44 /source/blender/blenlib/BLI_jitter.h | |
parent | 7176cbf466a49d78d3777595b2c6435ffa168df1 (diff) |
Mingw/Windows Compiling Fix:
In file included from source\blender\compositor\operations\COM_PlaneTrackMaskOperation.cpp:31:0:
source\blender\blenlib/BLI_jitter.h:36:65: error: expected ',' or '...' before numeric constant
source\blender\blenlib/BLI_jitter.h:37:65: error: expected ',' or '...' before numeric constant
It appears that an include used in COM_PlaneTrackMaskOperation.cpp brings in some Windows header file, which in turn defines rad/rad1/rad2 as some numeric constants.
Diffstat (limited to 'source/blender/blenlib/BLI_jitter.h')
-rw-r--r-- | source/blender/blenlib/BLI_jitter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_jitter.h b/source/blender/blenlib/BLI_jitter.h index 432bf73ad90..936a5260a68 100644 --- a/source/blender/blenlib/BLI_jitter.h +++ b/source/blender/blenlib/BLI_jitter.h @@ -33,8 +33,8 @@ */ void BLI_jitter_init(float *jitarr, int num); -void BLI_jitterate1(float *jit1, float *jit2, int num, float rad1); -void BLI_jitterate2(float *jit1, float *jit2, int num, float rad2); +void BLI_jitterate1(float *jit1, float *jit2, int num, float radius1); +void BLI_jitterate2(float *jit1, float *jit2, int num, float radius2); #endif |