Sergey Sharybin f3de312b83 Transform: Fix recent merge conflict resolution fiasco ... Why is it called legacy when this is a legit flags which are still to be checked at a runtime???		2017-11-30 16:36:24 +01:00
build_files	Merge branch 'master' into blender2.8	2017-11-30 18:30:41 +11:00
doc	Merge branch 'master' into blender2.8	2017-10-21 12:43:17 +11:00
extern	Merge branch 'master' into blender2.8	2017-11-30 18:30:41 +11:00
intern	Merge branch 'master' into blender2.8	2017-11-30 18:30:41 +11:00
release	Merge branch 'master' into blender2.8	2017-11-30 18:30:41 +11:00
source	Transform: Fix recent merge conflict resolution fiasco	2017-11-30 16:36:24 +01:00
tests	Fixing alembic unittest after render layer purge	2017-11-27 14:52:21 -02:00
.arcconfig	Blender 2.8: Update arc config	2017-05-01 15:20:19 +02:00
.gitignore	Build: add scripts to build dependencies for Windows and macOS.	2017-08-07 17:46:06 +02:00
.gitmodules	Merge branch 'master' into blender2.8	2017-04-03 15:15:56 +02:00
CMakeLists.txt	Merge branch 'master' into blender2.8	2017-11-30 18:30:41 +11:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	GNUmakefile: add back 'git pull'	2017-09-29 19:02:20 +10:00
make.bat	Merge branch 'master' into blender2.8	2017-09-11 16:52:53 +10:00