Sergey Sharybin 53bb66e291 Move color management check stuff from blo_read_file_internal to setup_app_data		2012-06-28 10:05:22 +00:00
build_files	Merging r48196 through r48223 from trunk into soc-2011-tomato	2012-06-23 18:08:56 +00:00
doc	style cleanup	2012-06-25 07:24:48 +00:00
extern	add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.	2012-06-23 14:23:44 +00:00
intern	svn merge ^/trunk/blender -r48321:48333	2012-06-27 14:36:06 +00:00
release	Clean-up and refactor of current OCIO integration	2012-06-27 18:10:53 +00:00
source	Move color management check stuff from blo_read_file_internal to setup_app_data	2012-06-28 10:05:22 +00:00
CMakeLists.txt	Merging r48257 through r48263 from trunk into soc-2011-tomato	2012-06-25 10:56:48 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	cmake edits	2012-05-27 10:03:13 +00:00
SConstruct	svn merge ^/trunk/blender -r48153:48158	2012-06-21 12:29:48 +00:00