Bastien Montagne 61af6b83e6 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/sculpt_paint/paint_image_proj.c

2018-06-19 16:49:54 +02:00

..

app

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

2018-06-14 22:54:42 +02:00

blender

Merge branch 'master' into blender2.8

2018-06-17 20:37:10 +02:00

bvh

Cycles: Cleanup, silence strict compiler warning

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

cmake

Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB

2018-06-14 22:21:37 +02: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-19 16:49:54 +02:00

render

Merge branch 'master' into blender2.8

2018-06-15 23:16:49 +02:00

subd

msvc: Use source folder structure for project file.

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

test

Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB

2018-06-14 22:21:37 +02:00

util

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

2018-06-14 22:54:42 +02:00

CMakeLists.txt

Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB

2018-06-14 22:21:37 +02:00