Tamito Kajiyama 2585d52405 Merged changes in the trunk up to revision 46045. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h

2012-04-29 00:59:04 +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 46045.

2012-04-29 00:59:04 +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