Commit: ea0d6afdddb2dee03ce796963e322056602e740c Author: Kévin Dietrich Date: Wed Nov 4 11:08:25 2020 +0100 Branches: cycles_procedural_api https://developer.blender.org/rBea0d6afdddb2dee03ce796963e322056602e740c
format =================================================================== M intern/cycles/blender/blender_curves.cpp M intern/cycles/blender/blender_mesh.cpp M intern/cycles/blender/blender_shader.cpp M intern/cycles/blender/blender_sync.cpp M intern/cycles/device/device_optix.cpp =================================================================== diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index dc6e4e7e54c..b27de2081ae 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -529,7 +529,8 @@ bool BlenderSync::object_has_particle_hair(BL::Object b_ob) } /* Old particle hair. */ -void BlenderSync::sync_particle_hair(Hair *hair, BL::Mesh &b_mesh, BL::Object &b_ob, bool motion, int motion_step) +void BlenderSync::sync_particle_hair( + Hair *hair, BL::Mesh &b_mesh, BL::Object &b_ob, bool motion, int motion_step) { /* obtain general settings */ if (b_ob.mode() == b_ob.mode_PARTICLE_EDIT || b_ob.mode() == b_ob.mode_EDIT) { diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 7aa4e890f41..079e087ffb6 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -1061,7 +1061,7 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *me for (const SocketType &socket : new_mesh.type->inputs) { /* Those sockets are updated in sync_object, so do not modify them. */ - if (socket.name == "use_motion_blur" || socket.name == "motion_steps") { + if (socket.name == "use_motion_blur" || socket.name == "motion_steps") { continue; } mesh->set_value(socket, new_mesh, socket); diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 039ca983eea..ac86cf3345c 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -432,7 +432,8 @@ static ShaderNode *add_node(Scene *scene, else if (b_node.is_a(&RNA_ShaderNodeAttribute)) { BL::ShaderNodeAttribute b_attr_node(b_node); AttributeNode *attr = graph->create_node<AttributeNode>(); - attr->set_attribute(blender_attribute_name_add_type(b_attr_node.attribute_name(), b_attr_node.attribute_type())); + attr->set_attribute(blender_attribute_name_add_type(b_attr_node.attribute_name(), + b_attr_node.attribute_type())); node = attr; } else if (b_node.is_a(&RNA_ShaderNodeBackground)) { diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 4599d379ed6..94ff0ff1473 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -318,7 +318,7 @@ void BlenderSync::sync_integrator() integrator->set_light_sampling_threshold(get_float(cscene, "light_sampling_threshold")); SamplingPattern sampling_pattern = (SamplingPattern)get_enum( - cscene, "sampling_pattern", SAMPLING_NUM_PATTERNS, SAMPLING_PATTERN_SOBOL); + cscene, "sampling_pattern", SAMPLING_NUM_PATTERNS, SAMPLING_PATTERN_SOBOL); int adaptive_min_samples = INT_MAX; diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 377e36a604e..95234845f98 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -1230,7 +1230,7 @@ class OptiXDevice : public CUDADevice { operation = OPTIX_BUILD_OPERATION_BUILD; } - if (geom->geometry_type == Geometry::HAIR) { + if (geom->geometry_type == Geometry::HAIR) { // Build BLAS for curve primitives Hair *const hair = static_cast<Hair *const>(ob->get_geometry()); if (hair->num_curves() == 0) { @@ -1395,7 +1395,7 @@ class OptiXDevice : public CUDADevice { // Allocate memory for new BLAS and build it if (build_optix_bvh(build_input, num_motion_steps, handle, out_data, operation)) { - geometry.insert({ob->get_geometry(), handle}); + geometry.insert({ob->get_geometry(), handle}); static_cast<BVHOptiX *>(geom->bvh)->optix_data_handle = out_data; static_cast<BVHOptiX *>(geom->bvh)->optix_handle = handle; static_cast<BVHOptiX *>(geom->bvh)->do_refit = false; @@ -1470,11 +1470,11 @@ class OptiXDevice : public CUDADevice { build_input.triangleArray.primitiveIndexOffset = mesh->optix_prim_offset; // Allocate memory for new BLAS and build it - if (build_optix_bvh(build_input, num_motion_steps, handle, out_data, operation)) { - geometry.insert({ob->get_geometry(), handle}); - static_cast<BVHOptiX *>(geom->bvh)->optix_data_handle = out_data; - static_cast<BVHOptiX *>(geom->bvh)->optix_handle = handle; - static_cast<BVHOptiX *>(geom->bvh)->do_refit = false; + if (build_optix_bvh(build_input, num_motion_steps, handle, out_data, operation)) { + geometry.insert({ob->get_geometry(), handle}); + static_cast<BVHOptiX *>(geom->bvh)->optix_data_handle = out_data; + static_cast<BVHOptiX *>(geom->bvh)->optix_handle = handle; + static_cast<BVHOptiX *>(geom->bvh)->do_refit = false; } else { return false; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs