Tamito Kajiyama cdbfd1db38 Merged changes in the trunk up to revision 45820. ...

Conflicts resolved:
source/creator/creator.c

2012-04-21 00:33:36 +00:00

..

RE_engine.h

Fix #30376: cycles ignores camera override from sequencer.

2012-04-13 17:42:03 +00:00

RE_pipeline.h

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

RE_render_ext.h

Blender Internal:

2012-04-14 21:48:34 +00:00

RE_shader_ext.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00