diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-24 15:19:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-26 16:37:04 +0300 |
| commit | fd25e883e2807a151f673b87c152a59701a0df80 (patch) | |
| tree | 9441933f32ba2672ca71c58842342a9c525e123e /intern/cycles/kernel/light | |
| parent | d7d40745fa09061a3117bd3669c5a46bbf611eae (diff) | |
Cycles: remove prefix from source code file names
Remove prefix of filenames that is the same as the folder name. This used
to help when #includes were using individual files, but now they are always
relative to the cycles root directory and so the prefixes are redundant.
For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.
Diffstat (limited to 'intern/cycles/kernel/light')
| -rw-r--r-- | intern/cycles/kernel/light/background.h (renamed from intern/cycles/kernel/light/light_background.h) | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/light/common.h (renamed from intern/cycles/kernel/light/light_common.h) | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/light/light.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/light/sample.h (renamed from intern/cycles/kernel/light/light_sample.h) | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/kernel/light/light_background.h b/intern/cycles/kernel/light/background.h index 78f8c94f7a3..d801cc94393 100644 --- a/intern/cycles/kernel/light/light_background.h +++ b/intern/cycles/kernel/light/background.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/light/light_common.h" +#include "kernel/light/common.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/light/light_common.h b/intern/cycles/kernel/light/common.h index 207e89090cc..75331d32d44 100644 --- a/intern/cycles/kernel/light/light_common.h +++ b/intern/cycles/kernel/light/common.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/light/light.h b/intern/cycles/kernel/light/light.h index facbbe23d0f..746c7747569 100644 --- a/intern/cycles/kernel/light/light.h +++ b/intern/cycles/kernel/light/light.h @@ -17,8 +17,8 @@ #pragma once #include "kernel/geom/geom.h" -#include "kernel/light/light_background.h" -#include "kernel/sample/sample_mapping.h" +#include "kernel/light/background.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/light/light_sample.h b/intern/cycles/kernel/light/sample.h index 4ae5d9e1944..6b643a95250 100644 --- a/intern/cycles/kernel/light/light_sample.h +++ b/intern/cycles/kernel/light/sample.h @@ -16,12 +16,12 @@ #pragma once -#include "kernel/integrator/integrator_path_state.h" -#include "kernel/integrator/integrator_shader_eval.h" +#include "kernel/integrator/path_state.h" +#include "kernel/integrator/shader_eval.h" #include "kernel/light/light.h" -#include "kernel/sample/sample_mapping.h" +#include "kernel/sample/mapping.h" CCL_NAMESPACE_BEGIN |