Brecht Van Lommel 0ed2309b4d Cycles: fix crash loading existing files, forgot to merge over this line.		2011-11-08 18:49:12 +00:00
build_files	Cycles Merge	2011-11-08 17:00:40 +00:00
doc	cmake & pep8 tidy up, also some style edits.	2011-11-08 01:32:34 +00:00
extern	cmake & pep8 tidy up, also some style edits.	2011-11-08 01:32:34 +00:00
intern	Cycles Merge:	2011-11-08 17:53:49 +00:00
release	Cycles Merge	2011-11-08 17:00:40 +00:00
source	Cycles: fix crash loading existing files, forgot to merge over this line.	2011-11-08 18:49:12 +00:00
CMakeLists.txt	stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set.	2011-11-08 18:15:53 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.	2011-11-05 14:26:18 +00:00
SConstruct	Modifier compilation tweaks (Blender conference commit)	2011-10-29 23:56:07 +00:00