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 c98b2e74df Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c

2018-06-12 12:38:54 +02:00

..

app

Merge branch 'master' into blender2.8

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

blender

Cleanup: remove object.is_visible.

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

bvh

Cycles: Cleanup, silence strict compiler warning

2018-06-11 13:02:10 +02:00

cmake

Fix Cycle standalone build.

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

device

Merge branch 'master' into blender2.8

2018-06-12 12:38:54 +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-06-11 14:44:03 +02:00

render

Fix T55436: crash with point density and shader tweaking.

2018-06-11 17:06:28 +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-06-11 14:44:03 +02:00

CMakeLists.txt

Windows: Add support for building with clang.

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