Bastien Montagne c8b3f13c9e Bring new IDP_MergeGroup() on par with other copying logic. ... We now have to support more complex copying types, which are controlled by flags, so all copying logic will need to take those at some point (at least, all potentially dealing with IDs).		2017-08-15 16:42:20 +02:00
build_files	Merge branch 'master' into blender2.8	2017-08-15 13:02:45 +02:00
doc	Merge branch 'master' into blender2.8	2017-08-03 07:14:02 +10:00
extern	Merge branch 'master' into blender2.8	2017-08-08 16:43:25 +02:00
intern	Fix building with OCIO after recent gawain files renamings.	2017-08-15 16:35:46 +02:00
release	Merge branch 'master' into blender2.8	2017-08-15 13:02:45 +02:00
source	Bring new IDP_MergeGroup() on par with other copying logic.	2017-08-15 16:42:20 +02:00
tests	Merge branch 'master' into blender2.8	2017-08-12 00:23:49 +10: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-06-27 09:59:36 +10:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	Merge branch 'master' into blender2.8	2017-08-10 15:57:59 +02:00
make.bat	Merge remote-tracking branch 'origin/master' into blender2.8	2017-05-03 23:55:29 +02:00