Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 25 Jun 2018 10:50:32 +0000 (12:50 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 25 Jun 2018 10:50:32 +0000 (12:50 +0200)
commite97237892c804a0ea82fe430cf0e1f4d16039dc4
treeaea045588506e38ff44a6e04d37a02094a7fddeb
parentcdee53edfc4d249ce198965a35cefe32a813854d
parent8a7f317666caa41aad0428b5ed3f399cdfbbd816
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
14 files changed:
source/blender/draw/intern/draw_manager.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/view3d_draw.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/nodes/composite/node_composite_tree.c
source/blender/nodes/intern/node_exec.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/intern/wm_init_exit.c