Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ...

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-08-02 00:10:05 +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 49478.

2012-08-02 00:10:05 +00:00

RE_render_ext.h

Blender Internal:

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

RE_shader_ext.h

style cleanup

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