This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama 4172997675 Merged changes in the trunk up to revision 50607. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-09-15 00:15:24 +00:00

..

RE_engine.h

Cycles: merge of changes from tomato branch.

2012-09-04 13:29:07 +00:00

RE_pipeline.h

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

RE_render_ext.h

fix for building on msvc2008 (also style cleanup)

2012-09-04 01:23:50 +00:00

RE_shader_ext.h

style cleanup

2012-06-06 22:38:39 +00:00