diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-13 17:24:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-13 17:24:56 +0300 |
| commit | 14f6e27f6a4875243c78f9942e3ba199fedb6d3e (patch) | |
| tree | b3b5b351297194d8d16dc99578c71edd50433766 /intern/cycles | |
| parent | 807b1a262ff36c2e40203f52b31bd4be523980b9 (diff) | |
Cycles: Cleanup, style
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_object_cull.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/session.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 29a68bf272e..35a30ae683f 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -523,7 +523,7 @@ static void xml_read_mesh(const XMLReadState& state, pugi::xml_node node) /* we don't yet support arbitrary attributes, for now add vertex * coordinates as generated coordinates if requested */ - if (mesh->need_attribute(state.scene, ATTR_STD_GENERATED)) { + if(mesh->need_attribute(state.scene, ATTR_STD_GENERATED)) { Attribute *attr = mesh->attributes.add(ATTR_STD_GENERATED); memcpy(attr->data_float3(), mesh->verts.data(), sizeof(float3)*mesh->verts.size()); } diff --git a/intern/cycles/blender/blender_object_cull.cpp b/intern/cycles/blender/blender_object_cull.cpp index b8582df0f93..08918dd1a49 100644 --- a/intern/cycles/blender/blender_object_cull.cpp +++ b/intern/cycles/blender/blender_object_cull.cpp @@ -43,7 +43,7 @@ BlenderObjectCulling::BlenderObjectCulling(Scene *scene, BL::Scene& b_scene) camera_cull_margin_ = get_float(cscene, "camera_cull_margin"); distance_cull_margin_ = get_float(cscene, "distance_cull_margin"); - if (distance_cull_margin_ == 0.0f) { + if(distance_cull_margin_ == 0.0f) { use_scene_distance_cull_ = false; } } diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 33721048722..73caf93ea00 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -834,11 +834,11 @@ void Session::update_status_time(bool show_pause, bool show_done) substatus = string_printf("Path Tracing Tile %d/%d", tile, num_tiles); - if(device->show_samples() || (is_cpu && is_last_tile)) - { + if(device->show_samples() || (is_cpu && is_last_tile)) { /* Some devices automatically support showing the sample number: * - CUDADevice - * - OpenCLDevice when using the megakernel (the split kernel renders multiple samples at the same time, so the current sample isn't really defined) + * - OpenCLDevice when using the megakernel (the split kernel renders multiple + * samples at the same time, so the current sample isn't really defined) * - CPUDevice when using one thread * For these devices, the current sample is always shown. * |