upstream changes

c2535f0f · TheNumbat · 8b8ee1f1 · c2535f0f · c2535f0f · c2535f0f
Commit c2535f0f authored Sep 26, 2020 by TheNumbat
--- a/src/student/samplers.cpp
+++ b/src/student/samplers.cpp
--- a/src/student/shapes.cpp
+++ b/src/student/shapes.cpp
--- a/src/student/skeleton.cpp
+++ b/src/student/skeleton.cpp
--- a/src/student/spline.cpp
+++ b/src/student/spline.cpp
--- a/src/student/tri_mesh.cpp
+++ b/src/student/tri_mesh.cpp
--- a/src/util/camera.cpp
+++ b/src/util/camera.cpp
--- a/src/util/camera.h
+++ b/src/util/camera.h
--- a/src/util/hdr_image.cpp
+++ b/src/util/hdr_image.cpp
--- a/src/util/hdr_image.h
+++ b/src/util/hdr_image.h
--- a/src/util/rand.cpp
+++ b/src/util/rand.cpp
--- a/src/util/rand.h
+++ b/src/util/rand.h
--- a/src/util/thread_pool.cpp
+++ b/src/util/thread_pool.cpp
--- a/src/util/thread_pool.h
+++ b/src/util/thread_pool.h