Bastien Montagne 204c167c72 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c

2018-06-11 16:02:46 +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-11 16:02:46 +02:00

wm_event_system.c

Merge branch 'master' into blender2.8

2018-06-10 12:11:16 +02:00

wm_files_link.c

Merge branch 'master' into blender2.8

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

wm_files.c

Merge branch 'master' into blender2.8

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

wm_gesture_ops.c

Code cleanup: remove WM subwindows.

2018-02-17 14:23:19 +01:00

wm_gesture.c

Merge branch 'master' into blender2.8

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

wm_init_exit.c

Merge branch 'master' into blender2.8

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

wm_jobs.c

Cleanup: trailing space for windowmanager

2018-06-07 16:43:52 +02:00

wm_keymap.c

Merge branch 'master' into blender2.8

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

wm_operator_props.c

Cleanup: trailing whitespace (comment blocks)

2018-06-01 18:19:39 +02:00

wm_operators.c

Merge branch 'master' into blender2.8

2018-06-11 16:02:46 +02:00

wm_playanim.c

Merge branch 'master' into blender2.8

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

wm_stereo.c

Cleanup: style, duplicate includes

2018-04-28 09:02:22 +02:00

wm_subwindow.c

Cleanup: trailing space for windowmanager

2018-06-07 16:43:52 +02:00

wm_toolsystem.c

Fix crash if no tool is set

2018-06-02 13:10:15 +02:00

wm_tooltip.c

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

wm_window.c

DRW: Fix animated material not refreshing

2018-06-08 16:29:33 +02:00

wm.c

Merge branch 'master' into blender2.8

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