Sybren A. Stüvel aa4102a441 Merge branch 'master' into blender2.8 ... Disabled a unittest, to be re-enabled when T51261 is fixed. # Conflicts: # source/blender/alembic/intern/alembic_capi.cc		2017-04-20 12:50:20 +02:00
build_files	Merge remote-tracking branch 'origin/master' into blender2.8	2017-04-18 16:30:13 +02:00
doc	Remove all instances of OBACT from drawobject.c and related changes	2017-03-02 17:09:24 +01:00
extern	Upgrade glew to v2.0	2017-04-10 14:53:32 +02:00
intern	Gawain: fix immediate mode drawing exceeding IMM_BUFFER_SIZE	2017-04-20 20:43:56 +10:00
release	Merge branch 'master' into blender2.8	2017-04-19 17:33:22 +02:00
source	Merge branch 'master' into blender2.8	2017-04-20 12:50:20 +02:00
tests	Merge branch 'master' into blender2.8	2017-04-20 12:50:20 +02:00
.arcconfig	Use HTTPS protocol for arc	2013-12-24 22:57:27 +06:00
.gitignore	Update .gitignore to some more generated/non-git-stored files.	2016-08-21 22:40:57 +02:00
.gitmodules	Merge branch 'master' into blender2.8	2017-04-03 15:15:56 +02:00
CMakeLists.txt	Add fatal error in CMake when trying to build WITH_GAMEENGINE but without WITH_LEGACY_OPENGL	2017-04-14 17:16:15 +02:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	Merge branch 'master' into blender2.8	2017-03-12 03:00:06 +11:00
make.bat	Use Git submodule tracking feature	2017-02-20 10:16:58 +01:00