From 0b00bb236ccc65d9861bbe6e9c50cb989117c9ee Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 28 Dec 2011 11:08:38 +0000 Subject: make MOD_dynamicpaint.c use more typical gpl2+ text and some formatting edits in DNA --- source/blender/makesdna/DNA_material_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (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 3e1cdd08086..189f52eead9 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -168,8 +168,8 @@ typedef struct Material { short sss_flag, sss_preset; int mapto_textured; /* render-time cache to optimise texture lookups */ - short shadowonly_flag; /* "shadowsonly" type */ - short index; /* custom index for render passes */ + short shadowonly_flag; /* "shadowsonly" type */ + short index; /* custom index for render passes */ ListBase gpumaterial; /* runtime */ } Material; -- cgit v1.2.3 From ca629d5ccc65da456babba6c5bdbfa0de737ac7b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 30 Dec 2011 07:25:49 +0000 Subject: minor dna header cleanup --- source/blender/makesdna/DNA_material_types.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (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 189f52eead9..55e9328a72a 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -24,13 +24,14 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef DNA_MATERIAL_TYPES_H -#define DNA_MATERIAL_TYPES_H /** \file DNA_material_types.h * \ingroup DNA */ +#ifndef DNA_MATERIAL_TYPES_H +#define DNA_MATERIAL_TYPES_H + #include "DNA_defs.h" #include "DNA_ID.h" #include "DNA_listBase.h" -- cgit v1.2.3