Julian Eisel 2a82162618 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/armature/pose_select.c
	source/blender/editors/include/ED_armature.h

2017-03-03 12:55:35 +01:00

..

gpu_basic_shader.c

Fix T49861: Interlace stereo drawing

2017-01-09 17:58:13 +01:00

gpu_batch.c

OpenGL immediate mode: fix inverted normal in sphere batch

2017-02-14 00:35:25 +01:00

gpu_buffers.c

OpenGL: draw PBVH bounding box with new imm mode

2017-03-02 21:40:13 -05:00

gpu_codegen.c

Modifications to GPU_texture:

2017-02-03 16:01:32 +01:00

gpu_codegen.h

Fix T48829: Memory leak on Blender Exit

2016-07-27 10:59:09 +02:00

gpu_compositing.c

plug ShaderInterface into GPUShader

2017-03-02 21:46:54 -05:00

gpu_debug.c

skip OpenGL debug logic on Apple

2017-02-28 04:38:30 -05:00

gpu_draw.c

Remove all instances of OBACT from drawobject.c and related changes

2017-03-02 17:09:24 +01:00

gpu_extensions.c

Clay-Engine (merge clay-engine)

2017-02-07 11:31:22 +01:00

gpu_framebuffer.c

Fix compiler warnings on macOS / clang / c++11.

2017-02-26 00:16:21 +01:00

gpu_immediate.c

Updating outliner_draw_struct_marks to retained mode

2017-01-15 19:30:05 -05:00

gpu_init_exit.c

OpenGL immediate mode: gluSphere replacement

2017-02-11 00:39:17 +01:00

gpu_material.c

Bring rendering back (update all references to SETLOPPER)

2017-02-15 14:40:56 +01:00

gpu_matrix.c

OpenGL: replace gluProject and gluUnProject, and simplify surrounding code.

2017-02-26 00:16:46 +01:00

gpu_private.h

Make OpenGL debug contexts a flag --debug-gpu instead of a compile time

2015-07-02 19:30:17 +02:00

gpu_select.c

Cleanup: GPU_select never took NULL rect

2017-03-03 22:24:08 +11:00

gpu_shader_private.h

plug ShaderInterface into GPUShader

2017-03-02 21:46:54 -05:00

gpu_shader.c

plug ShaderInterface into GPUShader

2017-03-02 21:46:54 -05:00

gpu_texture.c

Clay-Engine (merge clay-engine)

2017-02-07 11:31:22 +01:00

gpu_uniformbuffer.c

Clay-Engine (merge clay-engine)

2017-02-07 11:31:22 +01:00

gpu_viewport.c

Clay Engine: Use G.debug_value to test cache performance

2017-02-19 14:31:02 +01:00