Germano 790025c01e Merge branch 'master' into blender2.8 ...

# Conflicts:
#	intern/cycles/blender/blender_mesh.cpp
#	source/blender/editors/screen/screen_ops.c
#	source/blender/editors/space_view3d/drawobject.c

2018-01-21 18:45:47 -02:00

..

animation

Merge branch 'master' into blender2.8

2018-01-11 10:19:00 +11:00

armature

Fix T53788: Camera animation not working

2018-01-19 11:12:22 +01:00

curve

Fix T53788: Camera animation not working

2018-01-19 11:12:22 +01:00

datafiles

Remove SCons building system

2016-01-04 14:20:48 +05:00

gpencil

Fix T53788: Camera animation not working

2018-01-19 11:12:22 +01:00

include

Correct view3d_draw_bgpic_test declaration

2018-01-19 23:11:57 +11:00

interface

Merge branch 'master' into blender2.8

2018-01-21 18:45:47 -02:00

io

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

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

manipulator_library

Manipulator: tweak shape drawing

2018-01-20 19:41:41 +11:00

mask

Merge branch 'master' into blender2.8

2017-11-26 20:29:56 +01:00

mesh

Fix T53788: Camera animation not working

2018-01-19 11:12:22 +01:00

metaball

Merge branch 'master' into blender2.8

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

object

Static override: cleanup: name consistency.

2018-01-16 17:11:03 +01:00

physics

Fix T53788: Camera animation not working

2018-01-19 11:12:22 +01:00

render

Merge branch 'master' into blender2.8

2018-01-19 21:47:57 +11:00

scene

Workspaces: Store an active view-layer per scene

2017-12-01 16:15:30 +01:00

screen

Merge branch 'master' into blender2.8

2018-01-21 18:45:47 -02:00

sculpt_paint

Fix T53788: Camera animation not working

2018-01-19 11:12:22 +01: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-01-11 10:19:00 +11:00

space_api

Manipulator: view3d navigation buttons

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

space_buttons

Fix missing redraws when changing active view-layer or its name

2017-12-27 17:08:00 +01:00

space_clip

Merge branch 'master' into blender2.8

2018-01-09 12:52:13 +01:00

space_console

Merge branch 'master' into blender2.8

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

space_file

Merge branch 'master' into blender2.8

2017-12-05 22:38:13 +01:00

space_graph

Merge branch 'master' into blender2.8

2018-01-21 18:45:47 -02:00

space_image

Merge branch 'master' into blender2.8

2018-01-19 17:21:15 +11:00

space_info

Fix missing redraws when changing active view-layer or its name

2017-12-27 17:08:00 +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-01-04 00:09:10 +11:00

space_node

Merge branch 'master' into blender2.8

2018-01-16 12:07:43 +01:00

space_outliner

Outliner: Remove User Preferences

2018-01-19 16:06:14 -02:00

space_script

Add scene argument for notifiers

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

space_sequencer

Merge branch 'master' into blender2.8

2018-01-10 13:22:03 +01:00

space_text

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

2018-01-19 17:01:48 -02:00

space_time

WM: message bus replacement for property notifiers

2017-12-04 20:42:34 +11: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-01-21 18:45:47 -02:00

transform

Merge branch 'master' into blender2.8

2018-01-19 21:47:57 +11:00

util

Merge branch 'master' into blender2.8

2017-12-05 11:48:37 +01:00

uvedit

Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer

2017-11-23 14:58:01 -02:00

CMakeLists.txt

WM: move manipulator library into editors

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