Tamito Kajiyama 6cee7bb2b7 Merged changes in the trunk up to revision 52191. ...

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

2012-11-14 02:01:02 +00:00

..

RE_engine.h

Render Engines: fix crash when changing render engine during rendering

2012-11-13 11:00:46 +00:00

RE_pipeline.h

Merged changes in the trunk up to revision 52118.

2012-11-12 00:30:55 +00:00

RE_render_ext.h

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

RE_shader_ext.h

code cleanup: use float sizes for function args.

2012-10-15 23:11:59 +00:00