Bastien Montagne e97237892c Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/gpu/GPU_draw.h
	source/blender/gpu/GPU_material.h
	source/blender/gpu/intern/gpu_draw.c
	source/blender/gpu/intern/gpu_material.c
	source/blender/makesrna/intern/rna_userdef.c
	source/blender/windowmanager/intern/wm_files_link.c
	source/blender/windowmanager/intern/wm_init_exit.c
	source/creator/creator_args.c
	source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
	source/gameengine/Ketsji/KX_PythonInit.cpp
	source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

2018-06-25 12:50:32 +02:00

..

wm_cursors.c

Merge branch 'master' into blender2.8

2018-06-14 12:39:52 +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-25 12:50:32 +02:00

wm_event_system.c

Merge branch 'master' into blender2.8

2018-06-21 19:29:22 +02:00

wm_files_link.c

Cleanup: Nuke most of G.main from GPU code.

2018-06-25 12:32:48 +02:00

wm_files.c

Merge branch 'master' into blender2.8

2018-06-17 16:18:15 +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-25 12:50:32 +02:00

wm_jobs.c

Cleanup: trailing space for windowmanager

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

wm_keymap.c

Objects: support for hiding all objects in a collection.

2018-06-20 13:04:51 +02:00

wm_operator_props.c

WM: hide internal operator settings

2018-06-12 22:00:22 +02:00

wm_operators.c

UI: Add user defined context menu

2018-06-23 20:52:47 +02:00

wm_playanim.c

Fix animation player drawing wrong size

2018-06-19 18:03:08 +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

Fix leak of manipulator tooltip timers.

2018-06-12 17:07:18 +02:00

wm_window.c

Fix T55555: Crash when select material properties

2018-06-21 16:11:29 +02:00

wm.c

WM: revert part of Top-Bar inclusion

2018-06-14 21:58:11 +02:00