Tamito Kajiyama 141dd5233e Merged changes in the trunk up to revision 50257. ... Conflicts resolved: source/blender/blenkernel/CMakeLists.txt		2012-08-29 00:53:29 +00:00
build_files	Merged changes in the trunk up to revision 50257.	2012-08-29 00:53:29 +00:00
doc	Merged changes in the trunk up to revision 50257.	2012-08-29 00:53:29 +00:00
extern	Merged changes in the trunk up to revision 50257.	2012-08-29 00:53:29 +00:00
intern	missing linebreak when multithreaded gl meesage is printed to log	2012-08-28 13:43:20 +00:00
release	Merged changes in the trunk up to revision 50257.	2012-08-29 00:53:29 +00:00
source	Merged changes in the trunk up to revision 50257.	2012-08-29 00:53:29 +00:00
CMakeLists.txt	Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well.	2012-08-22 00:06:09 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	for the default make/cmake wrapper, use ../build_os rather then ../build/os	2012-08-15 22:59:23 +00:00
SConstruct	add back datatoc, use this instead of cmake script which was too slow.	2012-08-11 16:25:31 +00:00