[Bf-blender-cvs] [d0017eb] master: fix build error w/ clang

Campbell Barton noreply at git.blender.org
Sun Sep 20 12:42:58 CEST 2015


Commit: d0017eb5f2e6ebb9bfbdf2b6081685c998d6b9dc
Author: Campbell Barton
Date:   Sun Sep 20 20:27:09 2015 +1000
Branches: master
https://developer.blender.org/rBd0017eb5f2e6ebb9bfbdf2b6081685c998d6b9dc

fix build error w/ clang

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

M	source/blender/makesdna/DNA_meshdata_types.h

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

diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index e5cb222..59e6f28 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -452,8 +452,8 @@ enum {
  * So usage such as array lookup needs to check.
  */
 #define ME_MAT_NR_TEST(mat_nr, totmat) \
-	(CHECK_TYPE_ANY(mat_nr, short), \
-	 CHECK_TYPE_ANY(totmat, short), \
+	(CHECK_TYPE_ANY(mat_nr, short, const short), \
+	 CHECK_TYPE_ANY(totmat, short, const short), \
 	 (LIKELY(mat_nr < totmat) ? mat_nr : 0))
 
 /* mselect->type */




More information about the Bf-blender-cvs mailing list