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

Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c

2018-06-19 10:52:01 +02:00

..

alembic

Merge branch 'master' into blender2.8

2018-06-17 17:10:19 +02:00

avi

Cleanup: trailing space for remaining source/

2018-06-17 17:06:28 +02:00

blenfont

Merge branch 'master' into blender2.8

2018-06-08 08:10:35 +02:00

blenkernel

Studiolight: Add SH2 cache

2018-06-19 09:06:35 +02:00

blenlib

Merge branch 'master' into blender2.8

2018-06-18 12:32:12 +02:00

blenloader

Cleanup: simplify some view layer code.

2018-06-18 15:20:06 +02:00

blentranslation

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

bmesh

Multires: Remove unused function

2018-06-18 11:14:00 +02:00

collada

Merge branch 'master' into blender2.8

2018-06-17 16:18:15 +02:00

compositor

Merge branch 'master' into blender2.8

2018-06-17 17:10:19 +02:00

datatoc

Cleanup: trailing space

2018-06-08 08:07:48 +02:00

depsgraph

Depsgraph: Cleamup, reduce indentation level

2018-06-18 10:23:03 +02:00

draw

3D View: don't show manipulators when overlay is disabled

2018-06-18 18:33:02 +02:00

editors

Merge branch 'master' into blender2.8

2018-06-19 10:52:01 +02:00

freestyle

Merge branch 'master' into blender2.8

2018-06-17 17:10:19 +02:00

gpu

Cleanup: indentation

2018-06-18 08:10:23 +02:00

ikplugin

Merge branch 'master' into blender2.8

2018-06-08 08:10:35 +02:00

imbuf

Merge branch 'master' into blender2.8

2018-06-17 17:10:19 +02:00

makesdna

Object Mode: make mode locking optional

2018-06-18 20:43:26 +02:00

makesrna

UI: move object-mode lock out of the 3D header

2018-06-19 09:14:31 +02:00

modifiers

Merge branch 'master' into blender2.8

2018-06-17 17:10:19 +02:00

nodes

Merge branch 'master' into blender2.8

2018-06-15 23:16:49 +02:00

physics

Merge branch 'master' into blender2.8

2018-06-08 08:10:35 +02:00

python

Fix merge error in bpy_driver.c

2018-06-18 15:09:55 +02:00

render

Merge branch 'master' into blender2.8

2018-06-17 16:18:15 +02:00

windowmanager

Merge branch 'master' into blender2.8

2018-06-17 16:18:15 +02:00

CMakeLists.txt

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00