This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

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

Conflicts:
	source/blender/collada/MeshImporter.cpp
	source/blender/editors/object/object_add.c
	source/blender/editors/screen/screen_edit.c

2017-06-15 15:54:11 +02:00

..

alembic

Merge branch 'master' into blender2.8

2017-06-02 15:39:29 +10:00

avi

…

blenfont

Silence warnings in Mac (based on buildbot build report)

2017-05-17 18:13:10 +02:00

blenkernel

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

blenlib

Merge branch 'master' into blender2.8

2017-06-12 15:12:36 +02:00

blenloader

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

blentranslation

Rename probe to light-probe

2017-06-12 21:34:55 +10:00

bmesh

Merge branch 'master' into blender2.8

2017-06-09 19:40:47 +10:00

collada

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

compositor

Fix T51587: Blender fails to interpret a specific layer in OpenEXR multilayer file

2017-06-04 00:58:38 +02: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-06-14 12:02:58 +02:00

draw

Fix T51463: Eevee motion blur not working (with AMD)

2017-06-15 11:31:45 +02:00

editors

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

freestyle

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

gpu

Merge branch 'master' into blender2.8

2017-06-14 17:17:00 +10:00

ikplugin

Depsgraph: Fix frash with iTaSC solver

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

imbuf

Merge branch 'master' into blender2.8

2017-06-14 22:39:33 +02:00

makesdna

Updates to manipulator API

2017-06-15 20:56:22 +10:00

makesrna

Eevee: Use PROP_NONE for probe grid resolution

2017-06-15 15:02:32 +02:00

modifiers

Merge branch 'master' into blender2.8

2017-06-12 15:12:36 +02:00

nodes

Merge branch 'master' into blender2.8

2017-06-12 15:12:36 +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-06-15 10:17:51 +02:00

quicktime

Cleanup: comment blocks

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

render

Merge branch 'master' into blender2.8

2017-06-12 15:12:36 +02:00

windowmanager

Updates to manipulator API

2017-06-15 20:56:22 +10:00

CMakeLists.txt

Updates to manipulator API

2017-06-15 20:56:22 +10:00