Merged changes in the trunk up to revision 54110.
[blender.git] / source / blender / makesdna / DNA_material_types.h
index fceea396507183c54f8a5ab67324e74ce3c782b2..544535303bd099bad59d0bf0e04d2ada50e2a6e4 100644 (file)
@@ -177,6 +177,11 @@ typedef struct Material {
        short shadowonly_flag;  /* "shadowsonly" type */
        short index;            /* custom index for render passes */
 
+/* #ifdef WITH_FREESTYLE */
+       short vcol_alpha;
+       short pad4[3];
+/* #endif */
+
        ListBase gpumaterial;           /* runtime */
 } Material;