Bastien Montagne cfbd605567 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c

2016-07-12 00:07:44 +02:00

..

gpu_basic_shader.c

Fix GPU logical error changing stipple

2016-06-10 07:50:49 +10:00

gpu_buffers.c

Cleanup: redundant 4th index in sculpt PBVH

2016-07-06 19:15:47 +10:00

gpu_codegen.c

Merge branch 'master' into blender2.8

2016-06-10 05:17:33 +10:00

gpu_codegen.h

Fix T47207: Material shading incorrectly handles colorramp node

2016-02-02 12:50:56 +01:00

gpu_compositing.c

Cleanup: GPU headers

2016-06-09 05:38:43 +10:00

gpu_debug.c

Cleanup some warnings

2016-03-15 14:16:16 +05:00

gpu_draw.c

Merge branch 'master' into blender2.8

2016-06-27 15:59:01 +02:00

gpu_extensions.c

Cleanup: GPU headers

2016-06-09 05:38:43 +10:00

gpu_framebuffer.c

Cleanup: GPU headers

2016-06-09 05:38:43 +10:00

gpu_init_exit.c

Cleanup: GPU headers

2016-06-09 05:38:43 +10:00

gpu_material.c

Merge branch 'master' into blender2.8

2016-07-12 00:07:44 +02: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

Fix T47940: Custom bone shapes, select error w/ Open NVidia drivers

2016-03-31 00:59:04 +11:00

gpu_shader.c

Cleanup: GPU headers

2016-06-09 05:38:43 +10:00

gpu_texture.c

Cleanup: GPU headers

2016-06-09 05:38:43 +10:00