diff options
author | Chris Blackbourn <chrisbblend@gmail.com> | 2022-11-08 22:30:18 +0300 |
---|---|---|
committer | Chris Blackbourn <chrisbblend@gmail.com> | 2022-11-08 22:30:18 +0300 |
commit | 4b57bc4e5d4cada4a40d51745cc951f69f9aab08 (patch) | |
tree | 7ec6b4ee936e20317a89605abdaa113a6f16629e | |
parent | b539d425f020086151ef02e81b8a2f079b7011a3 (diff) |
Cleanup: format
-rw-r--r-- | intern/cycles/device/cuda/device_impl.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/cuda/device_impl.h | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_curves.c | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp index b56765208ee..c9764d1c21b 100644 --- a/intern/cycles/device/cuda/device_impl.cpp +++ b/intern/cycles/device/cuda/device_impl.cpp @@ -232,7 +232,7 @@ string CUDADevice::compile_kernel_get_common_cflags(const uint kernel_features) return cflags; } -string CUDADevice::compile_kernel(const string& common_cflags, +string CUDADevice::compile_kernel(const string &common_cflags, const char *name, const char *base, bool force_ptx) diff --git a/intern/cycles/device/cuda/device_impl.h b/intern/cycles/device/cuda/device_impl.h index bd6d806561b..c18f2811161 100644 --- a/intern/cycles/device/cuda/device_impl.h +++ b/intern/cycles/device/cuda/device_impl.h @@ -79,7 +79,7 @@ class CUDADevice : public Device { string compile_kernel_get_common_cflags(const uint kernel_features); - string compile_kernel(const string& cflags, + string compile_kernel(const string &cflags, const char *name, const char *base = "cuda", bool force_ptx = false); diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 23d514a7b12..8685db377d4 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -58,11 +58,11 @@ #include "BKE_lattice.h" #include "BKE_main.h" /* for Main */ #include "BKE_mesh.h" /* for ME_ defines (patching) */ +#include "BKE_mesh_legacy_convert.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_mesh_legacy_convert.h" #include "SEQ_iterator.h" #include "SEQ_sequencer.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_curves.c b/source/blender/nodes/texture/nodes/node_texture_curves.c index df75847dbe3..bdee2adb1ba 100644 --- a/source/blender/nodes/texture/nodes/node_texture_curves.c +++ b/source/blender/nodes/texture/nodes/node_texture_curves.c @@ -104,9 +104,8 @@ void register_node_type_tex_curve_rgb(void) node_type_size_preset(&ntype, NODE_SIZE_LARGE); ntype.initfunc = rgb_init; node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves); - ntype.init_exec_fn = node_initexec_curves ; - ntype.exec_fn =rgb_exec ; - + ntype.init_exec_fn = node_initexec_curves; + ntype.exec_fn = rgb_exec; nodeRegisterType(&ntype); } |