diff options
author | Thomas Dinges <blender@dingto.org> | 2016-02-13 15:40:48 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-02-13 15:41:40 +0300 |
commit | 6a593aba44a799a0b7981b4fb2a699b1cdd44fd2 (patch) | |
tree | b076dbb0ff7ead229f0adb4c129763a8d880f475 | |
parent | d1dd89348793dc578b03e5c551b42f7b20e9a579 (diff) |
Cleanup: Move Cycles sky model data to util.
-rw-r--r-- | intern/cycles/render/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/cycles/util/util_sky_model.cpp (renamed from intern/cycles/render/sky_model.cpp) | 4 | ||||
-rw-r--r-- | intern/cycles/util/util_sky_model.h (renamed from intern/cycles/render/sky_model.h) | 0 | ||||
-rw-r--r-- | intern/cycles/util/util_sky_model_data.h (renamed from intern/cycles/render/sky_model_data.h) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index 4e8a1794813..17ca6ce0f48 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -35,7 +35,6 @@ set(SRC scene.cpp session.cpp shader.cpp - sky_model.cpp sobol.cpp svm.cpp tables.cpp @@ -62,8 +61,6 @@ set(SRC_HEADERS scene.h session.h shader.h - sky_model.h - sky_model_data.h sobol.h svm.h tables.h diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index cb585377f97..57fb1a78f5b 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -21,8 +21,8 @@ #include "svm.h" #include "svm_math_util.h" #include "osl.h" -#include "sky_model.h" +#include "util_sky_model.h" #include "util_foreach.h" #include "util_transform.h" diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index d4f6a49953b..d0f634b42e1 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -62,6 +62,9 @@ set(SRC_HEADERS util_queue.h util_set.h util_simd.h + util_sky_model.cpp + util_sky_model.h + util_sky_model_data.h util_sseb.h util_ssef.h util_ssei.h diff --git a/intern/cycles/render/sky_model.cpp b/intern/cycles/util/util_sky_model.cpp index f9f14e8ef3b..a53c2ce1bb6 100644 --- a/intern/cycles/render/sky_model.cpp +++ b/intern/cycles/util/util_sky_model.cpp @@ -97,8 +97,8 @@ All instructions on how to use this code are in the accompanying header file. */ -#include "sky_model.h" -#include "sky_model_data.h" +#include "util_sky_model.h" +#include "util_sky_model_data.h" #include <assert.h> #include <stdio.h> diff --git a/intern/cycles/render/sky_model.h b/intern/cycles/util/util_sky_model.h index 237e4e61bf5..237e4e61bf5 100644 --- a/intern/cycles/render/sky_model.h +++ b/intern/cycles/util/util_sky_model.h diff --git a/intern/cycles/render/sky_model_data.h b/intern/cycles/util/util_sky_model_data.h index e6f3f761532..e6f3f761532 100644 --- a/intern/cycles/render/sky_model_data.h +++ b/intern/cycles/util/util_sky_model_data.h |