test/intern at e36ecb8a66574ccbed5d6888b5d4c8bbc197029f - test

Files

Bastien Montagne 94aa4d1657 Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_sequencer.h
	source/blender/blenkernel/intern/sequencer.c
	source/blender/editors/curve/editcurve_paint.c
	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/gpencil/gpencil_paint.c
	source/blender/editors/gpencil/gpencil_utils.c
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_view3d.h
	source/blender/editors/interface/interface_eyedropper_depth.c
	source/blender/editors/render/render_opengl.c
	source/blender/editors/sculpt_paint/paint_image_proj.c
	source/blender/editors/sculpt_paint/sculpt.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_intern.h
	source/blender/editors/space_view3d/view3d_select.c
	source/blender/editors/space_view3d/view3d_utils.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_snap.c
	source/blender/python/intern/gpu_offscreen.c
	source/blender/windowmanager/intern/wm_files.c

2018-06-08 14:38:57 +02:00

wm_cursors.c

Merge branch 'master' into blender2.8

2018-06-07 16:45:34 +02:00

wm_dragdrop.c

Merge branch 'master' into blender2.8

2018-06-07 16:45:34 +02:00

wm_draw.c

Merge branch 'master' into blender2.8

2018-06-07 16:45:34 +02:00

wm_event_system.c

WM: backport event/keymap type util from 2.8