Dalai Felinto 44517c5f21 Merge commit '212a8d9e5ae7' into blender2.8 ...

Considerable non-trivial merge conflict fixes.

2017-11-15 07:40:27 -02:00

..

alembic

Cleanup: Use full name for scene_layer in alembic

2017-11-09 15:45:21 +01:00

avi

…

blenfont

Fix assert failure when trying to draw empty string

2017-11-10 16:29:57 +01:00

blenkernel

Cleanup: order from a-z structs in BKE_collection.h and BKE_layer.h

2017-11-14 18:41:20 -02:00

blenlib

Add stdlib include for utildefines

2017-11-14 23:38:53 +11:00

blenloader

Cleanup: remove BLI_blenlib from ghash header

2017-11-14 17:08:34 +11:00

blentranslation

Merge branch 'master' into blender2.8

2017-08-12 14:06:29 +10:00

bmesh

Merge branch 'master' into blender2.8

2017-11-06 00:12:28 +11:00

collada

Farewell Scene->base

2017-11-08 18:39:01 -02:00

compositor

Moved alignment attributes from my last commit to BLI_compiler_attrs.h for future use.

2017-11-09 14:59:31 +01:00

datatoc

Cleanup: use static vars where appropriate

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

depsgraph

Merge commit '212a8d9e5ae7^' into blender2.8

2017-11-15 07:07:27 -02:00

draw

Eevee: SSS: Fix SSS with Add Shader node.

2017-11-14 21:34:20 +01:00

editors

Cleanup: remove BLI_blenlib from ghash header

2017-11-14 17:08:34 +11:00

freestyle

Depsgraph: Make dependency graph to be built from scene layer

2017-11-09 11:20:17 +01:00

gpu

Fix Opengl Error with glBlitFramebuffer

2017-11-14 20:49:33 +01:00

ikplugin

Pass EvaluationContext instead of bContext

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

imbuf

Cleanup: remove BLI_blenlib from ghash header

2017-11-14 17:08:34 +11:00

makesdna

Eevee: Initial Separable Subsurface Scattering implementation.

2017-11-14 00:49:54 +01:00

makesrna

Merge commit '212a8d9e5ae7' into blender2.8

2017-11-15 07:40:27 -02:00

modifiers

Merge branch 'master' into blender2.8

2017-10-29 17:31:55 +01:00

nodes

Eevee: Initial Separable Subsurface Scattering implementation.

2017-11-14 00:49:54 +01:00

physics

Cloth refactor: Remove goal springs and some other cleanup

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

python

Cleanup: remove BLI_blenlib from ghash header

2017-11-14 17:08:34 +11:00

render

Cleanup: Use full name for scene_layer in render

2017-11-09 15:45:21 +01:00

windowmanager

Cleanup: remove BLI_blenlib from ghash header

2017-11-14 17:08:34 +11:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2017-09-25 18:57:43 +05:00