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

..

gpu_basic_shader.c

Merge branch 'master' into blender2.8

2018-06-04 09:11:45 +02:00

gpu_batch_presets.c

GPUBatch: Change preset managment system.

2018-04-05 16:08:46 +02:00

gpu_batch.c

Cleanup: style

2018-04-19 07:47:03 +02:00

gpu_buffers.c

Merge branch 'master' into blender2.8

2018-06-04 09:11:45 +02:00

gpu_codegen.c

Cleanup: remove legacy GPU pass binding code.

2018-06-14 15:46:43 +02:00

gpu_codegen.h

Cleanup: remove legacy GPU pass binding code.

2018-06-14 15:46:43 +02:00

gpu_debug.c

GPU: Report number of compressed texture formats to help nailing crahs down in the future

2017-10-17 11:53:15 +02:00

gpu_draw.c

Merge branch 'master' into blender2.8

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

gpu_extensions.c

GPU: Fix missing case of new radeon on xorg.

2018-06-04 15:15:00 +02:00

gpu_framebuffer.c

Cleanup: style

2018-06-14 22:44:53 +02:00

gpu_immediate_util.c

GPU_immediate_util: add cube drawing function

2017-09-26 17:51:47 +10:00

gpu_immediate.c

Gawain: use ShaderInterface to manage uniforms

2017-04-13 01:07:51 -04:00

gpu_init_exit.c

Fix crash with OpenGL rendering in multiple threads on macOS.

2018-06-11 21:10:24 +02:00

gpu_material.c

Merge branch 'master' into blender2.8

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

gpu_matrix.c

Cleanup: style, duplicate includes

2017-10-07 15:57:14 +11:00

gpu_private.h

Fix crash with OpenGL rendering in multiple threads on macOS.

2018-06-11 21:10:24 +02:00

gpu_select_pick.c

Merge branch 'master' into blender2.8

2018-06-04 09:11:45 +02:00

gpu_select_private.h

GPU_select: remove unused finalize function

2018-03-01 16:43:45 +11:00

gpu_select_sample_query.c

Merge branch 'master' into blender2.8

2018-06-04 09:11:45 +02:00

gpu_select.c

Merge branch 'master' into blender2.8

2018-03-01 16:48:13 +11:00

gpu_shader_private.h

GPUShader/DRW: Add Transform Feedback support.

2018-05-16 16:58:32 +02:00

gpu_shader.c

Merge branch 'master' into blender2.8

2018-06-04 09:11:45 +02:00

gpu_texture.c

Cleanup: code style

2018-06-25 12:06:51 +02:00

gpu_uniformbuffer.c

Uniform Buffer Objects: Simplification refactor

2018-06-07 20:34:00 +02:00

gpu_viewport.c

DRW: Remove DRWTextureFormat in favor or GPUTextureFormat.

2018-04-30 16:39:26 +02:00