Tamito Kajiyama 3789c398ff Merged changes in the trunk up to revision 34828. ...

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

2011-02-13 23:47:30 +00:00

..

RE_pipeline.h

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

RE_render_ext.h

bugfix [#23595] Texture paint with a node based brush produces artifacts

2010-09-23 12:03:34 +00:00

RE_shader_ext.h

Raytrace modifications from the Render Branch.

2011-02-05 13:41:29 +00:00