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
..
2018-06-25 12:50:32 +02:00
2018-06-20 21:34:27 +02:00
2018-06-17 12:03:22 +02:00
2017-03-15 11:53:48 -04:00
2018-04-22 08:45:52 +02:00
2018-06-04 09:09:12 +02:00
2017-02-28 03:19:53 -05:00
2018-06-25 12:50:32 +02:00
2018-02-07 05:44:05 +01:00
2018-04-27 12:14:14 +02:00
2018-06-18 08:10:23 +02:00
2017-09-26 17:51:47 +10:00
2018-04-22 08:45:52 +02:00
2017-04-18 16:02:17 +02:00
2018-06-25 12:50:32 +02:00
2017-08-21 01:41:20 +10:00
2018-02-27 20:24:02 +11:00
2018-05-23 16:02:53 +02:00
2018-06-22 08:18:02 +02:00
2018-06-07 20:34:00 +02:00
2018-04-30 16:39:26 +02:00