This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Julian Eisel 07a1c20398 Merge branch 'blender2.8' into workspaces ...

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/workspace/screen_draw.c

2017-02-24 00:57:17 +01:00

..

animation

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

armature

Merge branch 'blender2.8' into workspaces

2017-02-10 03:51:18 +01:00

curve

Merge branch 'master' into blender2.8

2017-02-23 10:56:28 +01:00

datafiles

Remove SCons building system

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

gpencil

Merge branch 'master' into blender2.8

2017-02-17 20:03:55 +01:00

include

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

interface

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

io

COLLADA: Removed obsolete Export select option 'Both' which created invalid data (duplicate transformation information for nodes)

2016-11-02 14:11:46 +01:00

mask

OpenGL: further mask_draw tweaks

2017-02-17 15:42:11 -05:00

mesh

Merge branch 'master' into blender2.8

2017-02-08 13:10:16 +01:00

metaball

Fix T47969: Select Random always uses same seed

2016-03-29 01:24:57 +11:00

object

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

physics

Sorted BaseLegacy > Base convertions

2017-02-14 18:21:47 +01:00

render

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

scene

Fix compile error and warning in release builds

2017-01-06 01:18:34 +01:00

sculpt_paint

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

sound

Fix: Audio plays back incorrectly after rendering to a video file

2017-01-06 18:18:20 +01:00

space_action

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_api

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_buttons

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_clip

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_console

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_file

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_graph

Merge branch 'blender2.8' into workspaces

2017-02-10 03:51:18 +01:00

space_image

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_info

Merge branch 'blender2.8' into workspaces

2017-02-10 03:51:18 +01:00

space_logic

Merge branch 'blender2.8' into workspaces

2017-02-10 03:51:18 +01:00

space_nla

Merge branch 'blender2.8' into workspaces

2017-02-12 21:57:10 +01:00

space_node

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_outliner

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_script

Main work to move active scene into window

2016-12-08 00:17:34 +01:00

space_sequencer

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_text

Merge branch 'blender2.8' into workspaces

2017-01-22 23:26:44 +01:00

space_time

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

space_userpref

Main work to move active scene into window

2016-12-08 00:17:34 +01:00

space_view3d

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

transform

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

util

More cleanup (renaming, comments, etc), added asserts

2017-01-05 23:34:50 +01:00

uvedit

Cleanup: Style

2017-02-22 18:54:56 +01:00

workspace

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00

CMakeLists.txt

Merge branch 'blender2.8' into workspaces

2017-02-24 00:57:17 +01:00