git.blender.org - blender-staging.git/commit

author	Brecht Van Lommel <brechtvanlommel@pandora.be>
	Sat, 22 Oct 2011 18:54:57 +0000 (18:54 +0000)
committer	Brecht Van Lommel <brechtvanlommel@pandora.be>
	Sat, 22 Oct 2011 18:54:57 +0000 (18:54 +0000)
commit	83a44e48e7cb5cc6c794b50bb168a21144baeb06
tree	549504aa10e5c25cb06bdebeb16316f191d31c9e	tree
parent	586c631c88d7a4ea24810bf18ab96ed7ec542d37	commit \| diff

Cycles: some code changes to sync with trunk.

Repository to test new patches

source/blender/imbuf/IMB_imbuf_types.h		diff \| blob \| history
source/blender/render/CMakeLists.txt		diff \| blob \| history
source/blender/render/SConscript		diff \| blob \| history
source/blender/render/extern/include/RE_engine.h		diff \| blob \| history
source/blender/render/intern/source/external_engine.c	[moved from source/blender/render/intern/pipeline/engine.c with 99% similarity]	diff \| blob \| history
source/blender/render/intern/source/pipeline.c		diff \| blob \| history