diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-13 05:10:39 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-13 05:10:39 +0300 |
| commit | c8deda32763d68b59d28f00734785dc0c7a91571 (patch) | |
| tree | d5b7320d79136c7c2d0282fe45ec3be619ec6806 /source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp | |
| parent | 33efa9eeb63db672d9da97b68718aefb14b98f64 (diff) | |
| parent | 25a2eb4675f8e1fcf8b990bc345aac694dba8228 (diff) | |
Merged changes in the trunk up to revision 35505.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
Diffstat (limited to 'source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp')
0 files changed, 0 insertions, 0 deletions