Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 7 May 2018 16:02:48 +0000 (18:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 7 May 2018 16:02:48 +0000 (18:02 +0200)
commitb49184b608df297195c5f0e81da4d8d9ddfb9213
treec2624887be563319a7138516d2fcc6100acdb2c6
parentf62b826533422e5de3b08601e5511c233deda529
parentf74d85ffc8232a859b1419f5dc25b244ae04375f
Merge branch 'master' into blender2.8
15 files changed:
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenlib/intern/math_color.c
source/blender/collada/MeshImporter.cpp
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_image.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/render/intern/source/multires_bake.c