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

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

2017-04-05 10:02:25 +02:00

..

alembic

Merge branch 'master' into blender2.8

2017-04-05 10:02:25 +02:00

avi

Remove SCons building system

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

blenfont

Immediate Mode: glPop/glPushClientAttrib

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

blenkernel

Collada export cleanup

2017-04-04 20:44:22 +02:00

blenlib

Merge branch 'master' into blender2.8

2017-04-04 15:47:58 +02:00

blenloader

Object Engine: Fix multi user lamp data display bug.

2017-04-03 21:52:42 +02: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-03-31 23:52:22 +11:00

collada

Collada export cleanup

2017-04-04 20:44:22 +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

Merge branch 'master' into blender2.8

2017-04-03 15:15:56 +02:00

draw

Cleanup: avoid long lines (search tools complain!)

2017-04-04 17:38:51 +10:00

editors

Naming constancy for 'imm' utility functions

2017-04-05 17:46:25 +10:00

freestyle

OpenGL: no more display lists

2017-02-28 13:15:11 -05:00

gpu

Fix rotation manipulators not clipping

2017-04-05 01:33:10 +02:00

ikplugin

Depsgraph: Fix frash with iTaSC solver

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

imbuf

Fix a few compiler warnings with macOS / clang.

2017-02-18 23:59:34 +01:00

makesdna

Object Engine: Fix multi user lamp data display bug.

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

makesrna

Merge branch 'master' into blender2.8

2017-04-05 11:40:17 +10:00

modifiers

Merge branch 'master' into blender2.8

2017-03-31 23:52:22 +11: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-05 11:40:17 +10:00

quicktime

Cleanup: comment blocks

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

render

Merge branch 'master' into blender2.8

2017-04-03 15:15:56 +02:00

windowmanager

Naming constancy for 'imm' utility functions

2017-04-05 17:46:25 +10:00

CMakeLists.txt

CMake: add missing headers

2017-03-14 18:47:26 +11:00