diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-26 23:21:09 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-26 23:21:09 +0300 |
| commit | 63b31ef91b562a1a4aa95991323555a140dd6ede (patch) | |
| tree | 4287fcc7edc5e01efbd4b26d7c923c9b0cd8d830 /source/gameengine/Ketsji/BL_Material.cpp | |
| parent | 745e396d63ed15fa69203e04840597112498ec3b (diff) | |
| parent | 2f0d93ba563ae2c87a088f21113d5559ab9abfc4 (diff) | |
Merged changes in the trunk up to revision 35203.
Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c
Diffstat (limited to 'source/gameengine/Ketsji/BL_Material.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Material.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp index c63b9d55306..25fd5467e93 100644 --- a/source/gameengine/Ketsji/BL_Material.cpp +++ b/source/gameengine/Ketsji/BL_Material.cpp @@ -1,3 +1,6 @@ +/** \file gameengine/Ketsji/BL_Material.cpp + * \ingroup ketsji + */ // ------------------------------------ #include "BL_Material.h" #include "DNA_material_types.h" |