diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-12 04:09:57 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-12 04:09:57 +0400 |
| commit | 44e4c5f8316b34835c7900dc649bf8a1570afc0a (patch) | |
| tree | 99027196ffd166c78c336126d36c36bbc1621a29 /source/blender/makesdna/DNA_material_types.h | |
| parent | 8a340981be174cae842d339f0458ba6b558330c3 (diff) | |
| parent | 0682c3f1aefe315df5fe64ba8c814adacbd739e5 (diff) | |
Merged changes in the trunk up to revision 49797.
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 6952f1a9da7..1f185731e91 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -154,7 +154,7 @@ typedef struct Material { struct bNodeTree *nodetree; struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ struct Group *group; /* light group */ - struct PreviewImage * preview; + struct PreviewImage *preview; /* dynamic properties */ float friction, fh, reflect; |