Bastien Montagne 3a566687e1 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/readfile.c

2018-04-04 12:00:57 +02:00

..

alembic

Missed in last merge

2018-04-03 18:22:52 +02:00

avi

Fix buffer overflows in TIFF, PNG, IRIS, DPX, HDR and AVI loading.

2018-01-17 19:59:47 +01:00

blenfont

Merge branch 'master' into blender2.8

2018-04-01 11:03:25 +02:00

blenkernel

Merge branch 'master' into blender2.8

2018-04-04 10:36:39 +02:00

blenlib

Merge branch 'master' into blender2.8

2018-04-03 18:12:39 +02:00

blenloader

Merge branch 'master' into blender2.8

2018-04-04 12:00:57 +02:00

blentranslation

Merge branch 'master' into blender2.8

2018-02-15 14:15:55 +01:00

bmesh

Merge branch 'master' into blender2.8

2018-04-03 18:12:39 +02:00

collada

Merge commit 'origin/master^' into blender2.8

2018-03-29 10:36:01 -03:00

compositor

Merge branch 'master' into blender2.8

2018-04-03 18:12:39 +02:00

datatoc

Cleanup: use static vars where appropriate

2017-08-01 09:06:34 +10:00

depsgraph

Depsgraph: Get pchan index from correct pose

2018-04-04 11:55:06 +02:00

draw

Fix part of T53497: Eevee stuttering on macOS for the first few seconds of usage.

2018-04-04 11:30:55 +02:00

editors

Missed in last merge

2018-04-03 18:22:05 +02:00

freestyle

Cleanup: iterator macros

2018-03-09 11:52:11 +11:00

gpu

Fix crash on startup on macOS, after recent framebuffer refactoring.

2018-04-03 09:36:31 +02:00

ikplugin

Pass EvaluationContext instead of bContext

2017-08-16 12:46:04 +10:00

imbuf

Merge branch 'master' into blender2.8

2018-04-03 14:19:51 +02:00

makesdna

Merge branch 'master' into blender2.8

2018-04-04 09:54:50 +02:00

makesrna

Merge branch 'master' into blender2.8

2018-04-03 18:12:39 +02:00

modifiers

Merge branch 'master' into blender2.8

2018-04-02 15:18:10 +02:00

nodes

Merge branch 'master' into blender2.8

2018-03-20 16:13:37 +13:00

physics

Cleanup: remove global header

2018-04-01 07:24:45 +02:00

python

Merge branch 'master' into blender2.8

2018-04-03 14:19:51 +02:00

render

Merge branch 'master' into blender2.8

2018-04-03 18:12:39 +02:00

windowmanager

Missed in last merge

2018-04-03 18:22:05 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-02-07 11:19:01 +11:00