Julian Eisel 2a82162618 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/armature/pose_select.c
	source/blender/editors/include/ED_armature.h

2017-03-03 12:55:35 +01:00

..

app

Cycles: Cleanup, style

2017-01-13 15:24:56 +01:00

blender

Merge branch 'master' into blender2.8

2017-02-27 16:08:25 -03:00

bvh

Fix build error with macOS / clang / c++11.

2017-02-25 03:12:53 +01:00

cmake

Fix compilation error when CUDA toolkit is not installed

2016-11-07 14:47:10 +01:00

device

Cycles: Fix compilation error on vanilla Ubuntu 16.10

2017-02-27 15:22:51 +01:00

doc

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

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

graph

Cycles: Don't use guarded vector for statically initialized data

2016-10-24 14:18:22 +02:00

kernel

Cycles: Fix division by zero in volume code which was producing -nan

2017-02-28 17:33:06 +01:00

render

Cycles: Fix possibly uninitialized variable

2017-03-03 10:10:26 +01:00

subd

Cycles: Cleanup, style

2016-10-24 12:26:12 +02:00

test

Cycles: Cleanup, order of arguments to EXPECT_EQ

2017-02-03 11:35:34 +01:00

util

Cleanup: Grey --> Gray

2017-02-27 19:33:57 -05:00

CMakeLists.txt

Cycles: Use fast math without finite optimization

2017-02-13 16:25:35 +01:00