Lukas Tönne 4ff68d031d Fix for warnings/errors ... Conflicts: source/blender/blenkernel/intern/key.c source/blender/blenkernel/intern/particle_system.c source/blender/makesrna/intern/rna_particle.c		2015-01-20 09:30:05 +01:00
build_files	Moved the cloth solver code into a new subfolder/library inside Blender	2015-01-20 09:30:00 +01:00
doc	Documentation: fixed documented types to match actual types	2015-01-18 11:08:33 +01:00
extern	SDL wrangler: Support loading SDL2 libraries of different names	2015-01-14 00:26:43 +05:00
intern	Fix T42212: Singular reflection pass is incorrect in regular path tracer	2015-01-20 03:03:45 +05:00
release	Reorganizing hair dynamics UI layout a bit to make settings slightly	2015-01-20 09:30:05 +01:00
scons@625d446ae8	Fixed border extension for the sunbeams node.	2014-09-23 11:42:11 +02:00
source	Fix for warnings/errors	2015-01-20 09:30:05 +01:00
tests	Add some BLI helpers needed by asset branch.	2015-01-03 10:13:44 +01:00
.arcconfig	Use HTTPS protocol for arc	2013-12-24 22:57:27 +06:00
.gitignore	Revert "ignore conflict files"	2014-08-08 06:00:49 +10:00
.gitmodules	Initialize git submodules for addons, locales and scons	2013-11-15 12:19:08 +06:00
CMakeLists.txt	Select appropriate folder for MinGW-w64 gcc 4.9	2015-01-16 15:04:02 +02:00
COPYING
GNUmakefile	Force phony targets to build (even if file exists)	2014-12-20 02:15:14 +01:00
SConstruct	Input Method Editor (IME) support for text buttons	2014-12-07 00:58:17 +01:00