Bastien Montagne 4ee3d7e3ac Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/bmesh/intern/bmesh_mesh.c

2018-02-22 15:22:44 +01:00

..

animation

Merge branch 'master' into blender2.8

2018-02-22 00:59:32 +01:00

armature

Merge branch 'master' into blender2.8

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

curve

Merge branch 'master' into blender2.8

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

datafiles

Merge branch 'master' into blender2.8

2018-01-24 11:45:34 +11:00

gpencil

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

include

WorkSpace: object-mode switching support

2018-02-22 18:18:44 +11:00

interface

Code cleanup: remove WM subwindows.

2018-02-17 14:23:19 +01:00

io

Fix Collada importer (crash)

2018-01-26 09:16:31 -02:00

manipulator_library

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

mask

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

mesh

Merge branch 'master' into blender2.8

2018-02-22 15:22:44 +01:00

metaball

Merge branch 'master' into blender2.8

2017-11-20 20:45:03 +11:00

object

WorkSpace: object-mode switching support

2018-02-22 18:18:44 +11:00

physics

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

render

Merge branch 'master' into blender2.8

2018-02-16 01:17:43 +11:00

scene

Compositor / Render Layer Node: Fix wrong layer after deleting view layers

2018-01-30 18:31:38 -02:00

screen

WorkSpace: object-mode switching support

2018-02-22 18:18:44 +11:00

sculpt_paint

Cleanup: sync vertex-paint and sculpt from 2.8

2018-02-19 15:54:06 +11:00

sound

Rename any instance of scene layer or render layer in code with view layer

2017-11-23 07:48:23 -02:00

space_action

Merge branch 'master' into blender2.8

2018-02-22 15:22:44 +01:00

space_api

Manipulator: view3d navigation buttons

2017-12-16 04:21:30 +11:00

space_buttons

Cleanup: use workspace for object_mode when possible

2018-02-09 22:14:39 +11:00

space_clip

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

space_console

Merge branch 'master' into blender2.8

2017-10-18 17:09:41 +11:00

space_file

GPU: use alpha blend that works for drawing to transparent buffer.

2018-02-14 14:00:57 +01:00

space_graph

Merge branch 'master' into blender2.8

2018-02-22 00:59:32 +01:00

space_image

Merge branch 'master' into blender2.8

2018-02-16 01:17:43 +11:00

space_info

Code cleanup: remove WM subwindows.

2018-02-17 14:23:19 +01:00

space_logic

Merge branch 'master' into blender2.8

2018-01-04 00:09:10 +11:00

space_nla

Merge branch 'master' into blender2.8

2018-02-22 00:59:32 +01:00

space_node

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

space_outliner

Outliner: Fix crash when renaming Group layer collection

2018-02-19 10:52:03 -03:00

space_script

Add scene argument for notifiers

2017-05-02 09:58:01 +10:00

space_sequencer

GPU: use alpha blend that works for drawing to transparent buffer.

2018-02-14 14:00:57 +01:00

space_text

GPU: use alpha blend that works for drawing to transparent buffer.

2018-02-14 14:00:57 +01:00

space_time

GPU: use alpha blend that works for drawing to transparent buffer.

2018-02-14 14:00:57 +01:00

space_userpref

Add scene argument for notifiers

2017-05-02 09:58:01 +10:00

space_view3d

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

transform

Merge branch 'master' into blender2.8

2018-02-22 15:22:44 +01:00

util

WorkSpace: Restore saved object-modes again

2018-02-22 15:52:30 +11:00

uvedit

Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00

CMakeLists.txt

WM: move manipulator library into editors

2017-06-08 07:42:17 +10:00