Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Oct 2017 03:06:49 +0000 (14:06 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Oct 2017 03:06:49 +0000 (14:06 +1100)
commit0ffa64a45f7d961cb079a56629bcff105c81eb56
tree238bdd23687e6b54c1f75a35e5497837e8662bea
parentdd91d7d09d9994bc20bdbfb501d5101044ac99c8
parent99520e3f92e14eb3b7fab3f7decd0914a3da1360
Merge branch 'master' into blender2.8
31 files changed:
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_workspace.h
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/workspace.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenloader/BLO_readfile.h
source/blender/editors/include/ED_transform_snap_object_context.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/object/object_bake_api.c
source/blender/editors/object/object_edit.c
source/blender/editors/screen/workspace_edit.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_workspace_types.h
source/blender/makesrna/intern/rna_brush.c
source/blender/render/intern/source/external_engine.c
source/blender/windowmanager/intern/wm_draw.c