Tamito Kajiyama c8deda3276 Merged changes in the trunk up to revision 35505. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

2011-03-13 02:10:39 +00:00

..

RE_pipeline.h

Merged changes in the trunk up to revision 35203.

2011-02-26 20:21:09 +00:00

RE_render_ext.h

doxygen: entry for gpu, modifiers, nodes, python and render

2011-02-21 06:58:46 +00:00

RE_shader_ext.h

Bugfix #26388

2011-03-07 11:51:09 +00:00