Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 22 May 2017 20:49:02 +0000 (22:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 22 May 2017 20:49:02 +0000 (22:49 +0200)
commit44f91a9a18d6d942d958e7640f4d1c301d230150
treee7e97a57a920f02e87b7539740590a5058f7614e
parent6cc293a6d97a2f8277660613a1ced9b2688bd7c0
parent9b2923380092c7e3c771d354f8938c5ca20bfd9d
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenloader/intern/versioning_270.c
13 files changed:
CMakeLists.txt
intern/cycles/device/device_cuda.cpp
source/blender/blenlib/intern/listbase.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_text/space_text.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/nodes/NOD_static_types.h