Tamito Kajiyama 8925ed1420 Merged changes in the trunk up to revision 46557. ... Conflicts resolved: source/blender/blenkernel/intern/material.c source/blender/blenkernel/intern/subsurf_ccg.c source/blender/blenloader/intern/readfile.c source/blender/editors/animation/anim_channels_defines.c source/blender/makesrna/intern/rna_scene.c Additional changes: * Fix for recent changes of BKE_* function renaming. * Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().		2012-05-11 22:48:41 +00:00
build_files	Merged changes in the trunk up to revision 46557.	2012-05-11 22:48:41 +00:00
doc	Merged changes in the trunk up to revision 46309.	2012-05-05 11:40:42 +00:00
extern	Style cleanup: use 2 spaces for indentation in bundle scripts	2012-05-10 11:17:15 +00:00
intern	dont use sdl include when building headless	2012-05-11 14:17:49 +00:00
release	Merged changes in the trunk up to revision 46557.	2012-05-11 22:48:41 +00:00
source	Merged changes in the trunk up to revision 46557.	2012-05-11 22:48:41 +00:00
CMakeLists.txt	Enable ffmpeg building with MinGW-w64. The libraries were compiled with gcc 4.7, however is has been claimed there are issues with gcc > 4.4 so this is for testing purposes. Still it doesn't crash on startup anymore. Forgot to mention on ffmpeg lib commit that committed ffmpeg version is 0.10.2	2012-05-10 11:37:41 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	replace python3 command with python3.2, python3 isnt available on ubuntu.	2012-05-01 20:45:16 +00:00
SConstruct	Add pthread dll for MinGW64 during installation. Now people who download from buildbot will be able to run the build even without MinGW-w64 installed.	2012-05-01 20:57:39 +00:00