From a462d69bbf771e49d2fa49589608c375376b42ed Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 20 Dec 2012 07:57:26 +0000 Subject: Another big patch set by Bastien Montagne, thanks a lot! * Made Freestyle optional (turned on by default). * Fix for missing bpath.c updates in the previous merge of trunk changes. --- source/blender/makesdna/DNA_material_types.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/makesdna/DNA_material_types.h') diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 11b93b5fefe..919aa092616 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -177,8 +177,10 @@ 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; -- cgit v1.2.3