Cycles: Cleanup, style
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 13 Jan 2017 14:24:56 +0000 (15:24 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 13 Jan 2017 14:24:56 +0000 (15:24 +0100)
intern/cycles/app/cycles_xml.cpp
intern/cycles/blender/blender_object_cull.cpp
intern/cycles/render/session.cpp

index 29a68bf272eb1169bc24c9d028fcd42757d473fb..35a30ae683f1c434598c1af3ffc110bbe76d7663 100644 (file)
@@ -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());
        }
index b8582df0f9353f4271f0065981e75df57f5d8f17..08918dd1a49a830e16fd61380d8e1459e4828cb3 100644 (file)
@@ -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;
                }
        }
index 337210487220d142aff6ab2117ea581ab53b3f7b..73caf93ea00f17ee6592d3aced0d4292e2f5c0f8 100644 (file)
@@ -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.
                         *