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

..

blender

Merge branch 'master' into blender2.8

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

creator

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

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

tools @ 87f7038ee8

Cleanup: trailing space for remaining source/

2018-06-17 17:06:28 +02:00

CMakeLists.txt

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00