From 213b4f76eecbaefa83fbefe775eed3813230306d Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 19 Feb 2020 18:44:07 +0100 Subject: Cleanup: `make format` --- intern/cycles/blender/blender_mesh.cpp | 4 ++-- intern/cycles/device/cuda/device_cuda_impl.cpp | 4 ++-- intern/cycles/render/attribute.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 509da1601f3..42300f6eb6f 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -290,7 +290,7 @@ static void attr_create_vertex_color(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh, ustring vcol_name = ustring(l->name().c_str()); const bool need_vcol = mesh->need_attribute(scene, vcol_name) || - mesh->need_attribute(scene, vcol_std); + mesh->need_attribute(scene, vcol_std); if (!need_vcol) { continue; @@ -325,7 +325,7 @@ static void attr_create_vertex_color(Scene *scene, Mesh *mesh, BL::Mesh &b_mesh, ustring vcol_name = ustring(l->name().c_str()); const bool need_vcol = mesh->need_attribute(scene, vcol_name) || - mesh->need_attribute(scene, vcol_std); + mesh->need_attribute(scene, vcol_std); if (!need_vcol) { continue; diff --git a/intern/cycles/device/cuda/device_cuda_impl.cpp b/intern/cycles/device/cuda/device_cuda_impl.cpp index cd37c4dd407..5c25d7b0208 100644 --- a/intern/cycles/device/cuda/device_cuda_impl.cpp +++ b/intern/cycles/device/cuda/device_cuda_impl.cpp @@ -451,9 +451,9 @@ string CUDADevice::compile_kernel(const DeviceRequestedFeatures &requested_featu printf("Compiling CUDA kernel ...\n%s\n", command.c_str()); -#ifdef _WIN32 +# ifdef _WIN32 command = "call " + command; -#endif +# endif if (system(command.c_str()) != 0) { cuda_error_message( "Failed to execute compilation command, " diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp index 4fbf831087f..1e293f1aa16 100644 --- a/intern/cycles/render/attribute.cpp +++ b/intern/cycles/render/attribute.cpp @@ -483,7 +483,7 @@ Attribute *AttributeSet::add(AttributeStandard std, ustring name) attr = add(name, TypeDesc::TypeFloat, ATTR_ELEMENT_CORNER); break; case ATTR_STD_VERTEX_COLOR: - attr = add(name,TypeRGBA, ATTR_ELEMENT_CORNER_BYTE); + attr = add(name, TypeRGBA, ATTR_ELEMENT_CORNER_BYTE); break; case ATTR_STD_GENERATED: case ATTR_STD_POSITION_UNDEFORMED: -- cgit v1.2.3