[Bf-blender-cvs] [60741cfe181] master: Fix: Fix build error on windows

Ray Molenkamp noreply at git.blender.org
Fri May 1 16:06:40 CEST 2020


Commit: 60741cfe181c28aae9c747a85e39724f97ddcefb
Author: Ray Molenkamp
Date:   Fri May 1 08:06:34 2020 -0600
Branches: master
https://developer.blender.org/rB60741cfe181c28aae9c747a85e39724f97ddcefb

Fix: Fix build error on windows

Headers and implementation had slightly different signatures

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

M	source/blender/blenlib/BLI_math_vector.h

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

diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h
index d6e156a56cb..a171ff1bb1c 100644
--- a/source/blender/blenlib/BLI_math_vector.h
+++ b/source/blender/blenlib/BLI_math_vector.h
@@ -63,9 +63,9 @@ MINLINE void copy_v2_v2_uchar(unsigned char r[2], const unsigned char a[2]);
 MINLINE void copy_v3_v3_uchar(unsigned char r[3], const unsigned char a[3]);
 MINLINE void copy_v4_v4_uchar(unsigned char r[4], const unsigned char a[4]);
 
-MINLINE void copy_v2_uchar(unsigned char r[2], unsigned char a);
-MINLINE void copy_v3_uchar(unsigned char r[3], unsigned char a);
-MINLINE void copy_v4_uchar(unsigned char r[4], unsigned char a);
+MINLINE void copy_v2_uchar(unsigned char r[2], const unsigned char a);
+MINLINE void copy_v3_uchar(unsigned char r[3], const unsigned char a);
+MINLINE void copy_v4_uchar(unsigned char r[4], const unsigned char a);
 
 /* char */
 MINLINE void copy_v2_v2_char(char r[2], const char a[2]);



More information about the Bf-blender-cvs mailing list