diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-02-19 20:44:07 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-02-19 20:44:22 +0300 |
| commit | 213b4f76eecbaefa83fbefe775eed3813230306d (patch) | |
| tree | e91968d93086c8e2c1736556bb0dfab0b626cf19 /intern | |
| parent | 19f3a93e227cefc9ee1cc27178ca81ab4b244aa7 (diff) | |
Cleanup: `make format`
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/device/cuda/device_cuda_impl.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/render/attribute.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
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: |