diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-16 09:50:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-16 09:50:13 +0400 |
| commit | 17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47 (patch) | |
| tree | 23d28adc5ce3d24da631131bd1255410d0df23b5 /source/blender/gpu/intern/gpu_material.c | |
| parent | 32c7e22d3696e3575f4b7d05c1f7140591e88809 (diff) | |
| parent | 2e8ca6d1965bdcaaab672561aa2deddaf6b8f8b3 (diff) | |
Merged changes in the trunk up to revision 37539.
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py. This
problem resulted in empty menus in the GUI.
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
0 files changed, 0 insertions, 0 deletions