Tamito Kajiyama 16702c1729 Merged changes in the trunk up to revision 41225. ...

Conflicts resolved:
source/blender/render/intern/source/pipeline.c

2011-10-29 15:46:14 +00:00

..

RE_engine.h

Render API: add update_progress() function to update progress bar progress from

2011-10-22 17:01:54 +00:00

RE_pipeline.h

Merged changes in the trunk up to revision 41225.

2011-10-29 15:46:14 +00:00

RE_render_ext.h

use vector size and const args where possible (no functional change)

2011-09-12 13:00:24 +00:00

RE_shader_ext.h

fix for incorrect bake api usage. but not a bug.

2011-06-20 15:20:33 +00:00