Merged changes in the trunk up to revision 34828.

Conflicts resolved: source/blender/makesrna/RNA_enum_types.h
2011-02-13 23:47:30 +00:00
parent 5ed1597e26 4ca2905ead
commit 3789c398ff
530 changed files with 8801 additions and 6920 deletions
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -242,6 +242,7 @@ if(WITH_INSTALL)
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}/scripts
 			PATTERN ".svn" EXCLUDE
 			PATTERN "*.pyc" EXCLUDE
+			PATTERN "__pycache__" EXCLUDE
 		)
 		install(
 			DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/brushicons/