Commit: 0dccffb7aa4dcda626a8a3f91e5cf8c825132f4f
Author: Lukas Tönne
Date: Mon Apr 20 12:37:21 2015 +0200
Branches: strand_editmode
https://developer.blender.org/rB0dccffb7aa4dcda626a8a3f91e5cf8c825132f4f
Fix for CustomDataType syntax error from merging.
===================================================================
M source/blender/makesdna/DNA_customdata_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_customdata_types.h
b/source/blender/makesdna/DNA_customdata_types.h
index ed2a2ac..3202446 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -124,6 +124,7 @@ typedef enum CustomDataType {
CD_MSURFACE_SAMPLE = 42,
CD_NUMTYPES = 43
+} 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
