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.

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

Conflicts:
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_bake.c
	source/blender/editors/object/object_edit.c
	source/blender/editors/render/render_internal.c
	source/blender/makesrna/intern/rna_object_api.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-06-01 17:26:36 +02:00

..

app

Merge branch 'master' into blender2.8

2018-03-16 04:35:37 +01:00

blender

Merge branch 'master' into blender2.8

2018-06-01 17:26:36 +02:00

bvh

msvc: Use source folder structure for project file.

2018-02-03 16:38:27 -07:00

cmake

Fix Cycle standalone build.

2018-03-02 19:56:22 +01:00

device

Merge branch 'master' into blender2.8

2018-05-02 12:46:14 +02:00

doc

Cycles: relicense GNU GPL source code to Apache version 2.0.

2013-08-18 14:16:15 +00:00

graph

Cycles: Add Support for IES files as textures for light strength

2018-05-27 01:24:57 +02:00

kernel

Merge branch 'master' into blender2.8

2018-05-31 10:03:15 +02:00

render

Fix missing Cycles 3D viewport updates when editing materials, lamps.

2018-05-30 14:07:23 +02:00

subd

msvc: Use source folder structure for project file.

2018-02-03 16:38:27 -07:00

test

Fix Cycles gtests build on macOS.

2017-10-24 17:52:20 +02:00

util

Merge branch 'master' into blender2.8

2018-05-27 17:26:59 +02:00

CMakeLists.txt

Windows: Add support for building with clang.

2018-05-28 14:34:47 -06:00