Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Apr 2018 12:19:51 +0000 (14:19 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Apr 2018 12:19:51 +0000 (14:19 +0200)
commita2c0a382cd00b9b1a3058ad0017887e451b73465
treebe978c24be659a22afb22eb53c52c468e4087c06
parentfeb7852e1ba55b4c7f697ec52fee672a8cc2261c
parentb3004d30f5d5060035c5f8ac4cb6338463872877
Merge branch 'master' into blender2.8
13 files changed:
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/blenkernel/intern/displist.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/mesh/editmesh_extrude.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_edit_undo.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/sculpt_paint/paint_image_undo.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/space_action/action_buttons.c
source/blender/python/intern/bpy_rna.c