blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: `make format`

This commit is contained in:
Dalai Felinto 2020-02-19 18:44:07 +01:00
parent 19f3a93e22
commit 213b4f76ee
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_mesh.cpp
View File

@ -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;

4
intern/cycles/device/cuda/device_cuda_impl.cpp
View File

@ -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, "

2
intern/cycles/render/attribute.cpp
View File

@ -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: