Tamito Kajiyama 7fa096261a Merged changes in the trunk up to revision 52118. ...

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c

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

..

RE_engine.h

Cycles: memory usage report

2012-11-05 08:04:57 +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