Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Apr 2018 16:12:39 +0000 (18:12 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Apr 2018 16:12:39 +0000 (18:12 +0200)
commite52beb373323122f6d706e887a8ee3e2c58beb2e
tree0e409009d8aa4df733fe50dee504ae361040a171
parentc713e9c4724f2f75e28eb421021ed0428e919aab
parentab695c32974fde8720c04dff47d240b7fa0f8151
Merge branch 'master' into blender2.8
15 files changed:
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/sculpt_paint/paint_image_undo.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_buttons/buttons_texture.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp