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

Bastien Montagne 2113dbb013 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_outliner/outliner_select.c

2017-06-29 10:11:17 +02:00

..

alembic

Merge branch 'master' into blender2.8

2017-06-19 15:06:48 +10:00

avi

…

blenfont

Gawain API naming refactor

2017-06-19 20:18:04 +10:00

blenkernel

Merge branch 'master' into blender2.8

2017-06-29 10:11:17 +02:00

blenlib

Merge branch 'master' into blender2.8

2017-06-26 13:27:54 +10:00

blenloader

Indicate to users when manual conversion of Eevee materials is needed

2017-06-22 10:48:41 +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-29 10:11:17 +02:00

collada

Cleanup: remove unused function

2017-06-27 18:05:44 +10: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

Depsgraph: Fix crash with mouse select in edit mode with Copy-on-Write enabled

2017-06-19 15:09:48 +02:00

draw

DwM: no need to calculate face normal

2017-06-29 15:52:08 +10:00

editors

Merge branch 'master' into blender2.8

2017-06-29 10:11:17 +02:00

freestyle

Merge branch 'master' into blender2.8

2017-06-19 15:06:48 +10:00

gpu

Eevee: Add Initial support for Principle BRDF.

2017-06-29 01:47:59 +02: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-19 15:06:48 +10:00

makesdna

Depsgraph: Initial groundwork for copy-on-write support

2017-06-19 13:21:44 +02:00

makesrna

RNA: update_gpu_tag() to force Batch re-generation

2017-06-27 11:09:30 +10:00

modifiers

Merge remote-tracking branch 'origin/master' into blender2.8

2017-06-21 15:14:42 +02:00

nodes

Eevee: Add Initial support for Principle BRDF.

2017-06-29 01:47:59 +02:00

physics

Cloth refactor: Remove goal springs and some other cleanup

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

python

Used Py3.6 feature by accident, check version

2017-06-26 19:57:48 +10:00

quicktime

Cleanup: comment blocks

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

render

Merge branch 'master' into blender2.8

2017-06-19 15:06:48 +10:00

windowmanager

Merge branch 'master' into blender2.8

2017-06-27 09:59:36 +10:00

CMakeLists.txt

Updates to manipulator API

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