Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 8 Feb 2018 15:27:28 +0000 (16:27 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 8 Feb 2018 15:27:28 +0000 (16:27 +0100)
commit92786141159430fa36e59e0229e4bbb84f2f04be
treedd93e8f2a611ecbbc05646533798e97354d0f34e
parentbdc708762cf0fe0490bee3cf8452446da46d342a
parente0597baed57fa7a9dfaf6dff6d0fa120784d21ea
Merge branch 'master' into blender2.8
CMakeLists.txt
build_files/cmake/macros.cmake
extern/CMakeLists.txt
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_boolean.c
source/blender/python/intern/CMakeLists.txt
source/blenderplayer/CMakeLists.txt