Bastien Montagne e8b6bcd65c Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/editors/object/object_add.c
	source/blender/python/intern/bpy_app_handlers.c

2017-08-08 16:43:25 +02:00

..

gtests

BLI_memiter: Small API for many small allocations

2017-07-30 00:08:17 +10:00

python

Merge branch 'master' into blender2.8

2017-08-07 16:16:43 +02:00

check_deprecated.py

Remove SCons building system

2016-01-04 14:20:48 +05:00

CMakeLists.txt

Fix compilation error when building without Blender

2017-08-08 11:32:33 +02:00