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/film | |
| 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/film')
| -rw-r--r-- | intern/cycles/kernel/film/accumulate.h (renamed from intern/cycles/kernel/film/film_accumulate.h) | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/film/adaptive_sampling.h (renamed from intern/cycles/kernel/film/film_adaptive_sampling.h) | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/film/id_passes.h (renamed from intern/cycles/kernel/film/film_id_passes.h) | 0 | ||||
| -rw-r--r-- | intern/cycles/kernel/film/passes.h (renamed from intern/cycles/kernel/film/film_passes.h) | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/film/read.h (renamed from intern/cycles/kernel/film/film_read.h) | 0 | ||||
| -rw-r--r-- | intern/cycles/kernel/film/write_passes.h (renamed from intern/cycles/kernel/film/film_write_passes.h) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/film/film_accumulate.h b/intern/cycles/kernel/film/accumulate.h index 91424fdbe21..30e1afea751 100644 --- a/intern/cycles/kernel/film/film_accumulate.h +++ b/intern/cycles/kernel/film/accumulate.h @@ -16,10 +16,10 @@ #pragma once -#include "kernel/film/film_adaptive_sampling.h" -#include "kernel/film/film_write_passes.h" +#include "kernel/film/adaptive_sampling.h" +#include "kernel/film/write_passes.h" -#include "kernel/integrator/integrator_shadow_catcher.h" +#include "kernel/integrator/shadow_catcher.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/film/film_adaptive_sampling.h b/intern/cycles/kernel/film/adaptive_sampling.h index c78b5f6b707..468c5d4486e 100644 --- a/intern/cycles/kernel/film/film_adaptive_sampling.h +++ b/intern/cycles/kernel/film/adaptive_sampling.h @@ -16,7 +16,7 @@ #pragma once -#include "kernel/film/film_write_passes.h" +#include "kernel/film/write_passes.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/film/film_id_passes.h b/intern/cycles/kernel/film/id_passes.h index d5b8c90a828..d5b8c90a828 100644 --- a/intern/cycles/kernel/film/film_id_passes.h +++ b/intern/cycles/kernel/film/id_passes.h diff --git a/intern/cycles/kernel/film/film_passes.h b/intern/cycles/kernel/film/passes.h index 6c124247f89..3a91d1653fe 100644 --- a/intern/cycles/kernel/film/film_passes.h +++ b/intern/cycles/kernel/film/passes.h @@ -18,8 +18,8 @@ #include "kernel/geom/geom.h" -#include "kernel/film/film_id_passes.h" -#include "kernel/film/film_write_passes.h" +#include "kernel/film/id_passes.h" +#include "kernel/film/write_passes.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/film/film_read.h b/intern/cycles/kernel/film/read.h index a87eff3832e..a87eff3832e 100644 --- a/intern/cycles/kernel/film/film_read.h +++ b/intern/cycles/kernel/film/read.h diff --git a/intern/cycles/kernel/film/film_write_passes.h b/intern/cycles/kernel/film/write_passes.h index 9d379495629..9d379495629 100644 --- a/intern/cycles/kernel/film/film_write_passes.h +++ b/intern/cycles/kernel/film/write_passes.h |