This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama ce03ec4b86 Merged changes in the trunk up to revision 38543. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

2011-07-20 23:33:10 +00:00

..

CMakeLists.txt

Merged changes in the trunk up to revision 38543.

2011-07-20 23:33:10 +00:00

render_intern.h

Merged changes in the trunk up to revision 37388.

2011-06-11 00:22:10 +00:00

render_internal.c

RenderEngine API: add self.report() error reporting function for render engines,

2011-06-28 16:25:07 +00:00

render_opengl.c

fix [#27862] OpenGL render animation don't respect .png RGB option.

2011-07-05 07:46:25 +00:00

render_ops.c

Merged changes in the trunk up to revision 35367.

2011-03-06 12:13:32 +00:00

render_preview.c

dont include the preview.blend in headless mode

2011-07-13 19:27:42 +00:00

render_shading.c

Merged changes in the trunk up to revision 37388.

2011-06-11 00:22:10 +00:00

render_update.c

Code refactor: split code for render updates and opening render view into

2011-05-19 11:34:11 +00:00

render_view.c

fix for crash opening the file selector twice with multiple windows open (when the mouse was over the inactive window).

2011-06-06 00:42:36 +00:00

SConscript

Merged changes in the trunk up to revision 27178.

2010-02-28 03:44:15 +00:00