Commit: e88715dcf45be099cb0d92bedbf3c084b179c113
Author: Bastien Montagne
Date: Mon Jan 26 18:05:04 2015 +0100
Branches: temp_custom_loop_normals
https://developer.blender.org/rBe88715dcf45be099cb0d92bedbf3c084b179c113
Merge branch 'master' into temp_custom_loop_normals
Conflicts:
source/blender/makesdna/DNA_customdata_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_customdata_types.h
index 89e964c,7fedad2..74f5967
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@@ -120,10 -119,9 +120,10 @@@ typedef enum CustomDataType
CD_FREESTYLE_FACE = 38,
CD_MLOOPTANGENT = 39,
CD_TESSLOOPNORMAL = 40,
+ CD_CUSTOMLOOPNORMAL = 41,
- CD_NUMTYPES = 41
+ CD_NUMTYPES = 42
- };
+ } CustomDataType;
/* Bits for CustomDataMask */
#define CD_MASK_MVERT (1 << CD_MVERT)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
