Tamito Kajiyama 68ae82bb47 Merged changes in the trunk up to revision 43585. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-01-21 23:01:25 +00:00

..

RE_engine.h

Fix #29406: show Sequence as render layer when rendering from sequencer, to make

2011-11-26 18:33:31 +00:00

RE_pipeline.h

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

RE_render_ext.h

Merge with trunk r41342

2011-10-28 17:00:53 +00:00

RE_shader_ext.h

Fix #27120: Bake to image used for rendering glitch (bake feedback loop)

2012-01-20 07:43:46 +00:00