Bastien Montagne 95b3632112 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/alembic/intern/abc_exporter.cc

2017-04-14 12:39:54 +02:00

..

alembic

Merge branch 'master' into blender2.8

2017-04-14 12:39:54 +02:00

avi

Remove SCons building system

2016-01-04 14:20:48 +05:00

blenfont

Merge branch 'master' into blender2.8

2017-04-14 12:39:54 +02:00

blenkernel

Draw Manager: lattice editmode drawing

2017-04-14 04:34:12 +10:00

blenlib

Merge branch 'master' into blender2.8

2017-04-14 12:39:54 +02:00

blenloader

Draw Manager: initial lattice support

2017-04-13 22:09:59 +10:00

blentranslation

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

bmesh

Merge branch 'master' into blender2.8

2017-04-07 17:28:22 +02:00

collada

Depsgraph: Remove old depsgraph header from collada

2017-04-06 16:17:21 +02:00

compositor

Fix T50849: Transparent background produces artifacts in this compositing setup

2017-03-08 15:56:50 +01:00

datatoc

Fix compilation error on recent Debian desktop

2016-12-05 11:35:26 +01:00

depsgraph

Depsgraph: Remove olde depsgraph header from new depsgraph

2017-04-06 16:18:42 +02:00

draw

Draw Manager: lattice editmode drawing

2017-04-14 04:34:12 +10:00

editors

Merge branch 'master' into blender2.8

2017-04-14 12:39:54 +02:00

freestyle

Depsgraph: Remove old depsgraph header from freestyle

2017-04-06 16:32:59 +02:00

gpu

OpenGL: use ShaderInterface to look up uniforms

2017-04-13 18:37:26 -04:00

ikplugin

Depsgraph: Fix frash with iTaSC solver

2016-11-15 16:18:59 +01:00

imbuf

Color management: Avoid memory copy into same buffer

2017-04-12 10:23:38 +02:00

makesdna

Draw Manager: initial lattice support

2017-04-13 22:09:59 +10:00

makesrna

Layer collection settings API

2017-04-13 15:38:15 +02:00

modifiers

Merge branch 'master' into blender2.8

2017-04-14 12:39:54 +02:00

nodes

GPULamp: Separate GPULamp from GPUMaterial

2017-04-03 21:52:03 +02:00

physics

Cloth refactor: Remove goal springs and some other cleanup

2017-03-23 03:52:46 -03:00

python

Merge branch 'master' into blender2.8

2017-04-13 13:02:39 +03:00

quicktime

Cleanup: comment blocks

2016-07-15 02:39:45 +10:00

render

Depsgraph: Remove old depsgraph header from blender internal

2017-04-06 16:38:43 +02:00

windowmanager

Revert "OpenGL core: add some missing gpuBegin to allow clay with no UI"

2017-04-13 18:24:04 -04:00

CMakeLists.txt

Changes from custom-manipulators branch

2017-04-06 22:10:09 +10:00