[Bf-blender-cvs] [07486ae6391] cycles_procedural_api: run clang format
Kévin Dietrich
noreply at git.blender.org
Tue Sep 22 14:14:45 CEST 2020
Commit: 07486ae6391fb9d1ac65178ee465bd67e214b387
Author: Kévin Dietrich
Date: Thu Sep 10 19:23:01 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB07486ae6391fb9d1ac65178ee465bd67e214b387
run clang format
===================================================================
M intern/cycles/blender/blender_curves.cpp
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/blender/blender_object.cpp
M intern/cycles/blender/blender_particles.cpp
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/blender/blender_volume.cpp
M intern/cycles/bvh/bvh_embree.cpp
M intern/cycles/bvh/bvh_split.cpp
M intern/cycles/graph/node.cpp
M intern/cycles/graph/node.h
M intern/cycles/render/alembic.cpp
M intern/cycles/render/alembic.h
M intern/cycles/render/camera.h
M intern/cycles/render/geometry.cpp
M intern/cycles/render/nodes.cpp
M intern/cycles/render/nodes.h
M intern/cycles/render/object.cpp
M intern/cycles/render/scene.cpp
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index b1fdf9712e3..d5e120b8acf 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -847,8 +847,7 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph,
/* Compares curve_keys rather than strands in order to handle quick hair
* adjustments in dynamic BVH - other methods could probably do this better. */
- const bool rebuild = (hair->curve_keys_is_modified() ||
- hair->curve_radius_is_modified());
+ const bool rebuild = (hair->curve_keys_is_modified() || hair->curve_radius_is_modified());
hair->tag_update(scene, rebuild);
}
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 15cdf227bfe..7f098a5830e 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -1062,8 +1062,7 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph,
sync_mesh_fluid_motion(b_ob, scene, mesh);
/* tag update */
- bool rebuild = (mesh->triangles_is_modified()) ||
- (oldsubd_faces != mesh->get_subd_faces()) ||
+ bool rebuild = (mesh->triangles_is_modified()) || (oldsubd_faces != mesh->get_subd_faces()) ||
(mesh->subd_face_corners_is_modified());
mesh->tag_update(scene, rebuild);
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 4a4a22c3aa0..447a7bd7e2f 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -252,7 +252,8 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
/* object sync
* transform comparison should not be needed, but duplis don't work perfect
* in the depsgraph and may not signal changes, so this is a workaround */
- if (object->is_modified() || object_updated || (object->get_geometry() && object->get_geometry()->is_modified()) ||
+ if (object->is_modified() || object_updated ||
+ (object->get_geometry() && object->get_geometry()->is_modified()) ||
tfm != object->get_tfm()) {
object->name = b_ob.name().c_str();
object->set_pass_id(b_ob.pass_index());
@@ -298,7 +299,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
/* dupli texture coordinates and random_id */
if (is_instance) {
object->set_dupli_generated(0.5f * get_float3(b_instance.orco()) -
- make_float3(0.5f, 0.5f, 0.5f));
+ make_float3(0.5f, 0.5f, 0.5f));
object->set_dupli_uv(get_float2(b_instance.uv()));
object->set_random_id(b_instance.random_id());
}
diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp
index b2e42f62887..6f9a0da9d67 100644
--- a/intern/cycles/blender/blender_particles.cpp
+++ b/intern/cycles/blender/blender_particles.cpp
@@ -57,7 +57,8 @@ bool BlenderSync::sync_dupli_particle(BL::Object &b_ob,
scene, &psys, b_ob, b_instance.object(), key);
/* no update needed? */
- if (!need_update && !object->get_geometry()->is_modified() && !scene->object_manager->need_update)
+ if (!need_update && !object->get_geometry()->is_modified() &&
+ !scene->object_manager->need_update)
return true;
/* first time used in this sync loop? clear and tag update */
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index fcfdbf2e71b..f03e257c0a0 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -341,7 +341,8 @@ static ShaderNode *add_node(Scene *scene,
else if (b_node.is_a(&RNA_ShaderNodeVectorRotate)) {
BL::ShaderNodeVectorRotate b_vector_rotate_node(b_node);
VectorRotateNode *vector_rotate_node = graph->create_node<VectorRotateNode>();
- vector_rotate_node->set_rotate_type((NodeVectorRotateType)b_vector_rotate_node.rotation_type());
+ vector_rotate_node->set_rotate_type(
+ (NodeVectorRotateType)b_vector_rotate_node.rotation_type());
vector_rotate_node->set_invert(b_vector_rotate_node.invert());
node = vector_rotate_node;
}
@@ -349,9 +350,10 @@ static ShaderNode *add_node(Scene *scene,
BL::ShaderNodeVectorTransform b_vector_transform_node(b_node);
VectorTransformNode *vtransform = graph->create_node<VectorTransformNode>();
vtransform->set_transform_type((NodeVectorTransformType)b_vector_transform_node.vector_type());
- vtransform->set_convert_from((NodeVectorTransformConvertSpace)
- b_vector_transform_node.convert_from());
- vtransform->set_convert_to((NodeVectorTransformConvertSpace)b_vector_transform_node.convert_to());
+ vtransform->set_convert_from(
+ (NodeVectorTransformConvertSpace)b_vector_transform_node.convert_from());
+ vtransform->set_convert_to(
+ (NodeVectorTransformConvertSpace)b_vector_transform_node.convert_to());
node = vtransform;
}
else if (b_node.is_a(&RNA_ShaderNodeNormal)) {
@@ -525,11 +527,11 @@ static ShaderNode *add_node(Scene *scene,
else if (b_node.is_a(&RNA_ShaderNodeBsdfHairPrincipled)) {
BL::ShaderNodeBsdfHairPrincipled b_principled_hair_node(b_node);
PrincipledHairBsdfNode *principled_hair = graph->create_node<PrincipledHairBsdfNode>();
- principled_hair->set_parametrization((NodePrincipledHairParametrization)get_enum(
- b_principled_hair_node.ptr,
- "parametrization",
- NODE_PRINCIPLED_HAIR_NUM,
- NODE_PRINCIPLED_HAIR_REFLECTANCE));
+ principled_hair->set_parametrization(
+ (NodePrincipledHairParametrization)get_enum(b_principled_hair_node.ptr,
+ "parametrization",
+ NODE_PRINCIPLED_HAIR_NUM,
+ NODE_PRINCIPLED_HAIR_REFLECTANCE));
node = principled_hair;
}
else if (b_node.is_a(&RNA_ShaderNodeBsdfPrincipled)) {
@@ -699,8 +701,8 @@ static ShaderNode *add_node(Scene *scene,
new BlenderImageLoader(b_image, image_frame), image->image_params());
}
else {
- ustring filename = ustring(image_user_file_path(
- b_image_user, b_image, b_scene.frame_current(), true));
+ ustring filename = ustring(
+ image_user_file_path(b_image_user, b_image, b_scene.frame_current(), true));
image->set_filename(filename);
}
}
@@ -735,8 +737,8 @@ static ShaderNode *add_node(Scene *scene,
env->image_params());
}
else {
- env->set_filename(ustring(image_user_file_path(
- b_image_user, b_image, b_scene.frame_current(), false)));
+ env->set_filename(
+ ustring(image_user_file_path(b_image_user, b_image, b_scene.frame_current(), false)));
}
}
node = env;
@@ -910,7 +912,7 @@ static ShaderNode *add_node(Scene *scene,
float3 loc, size;
point_density_texture_space(b_depsgraph, b_point_density_node, loc, size);
point_density->set_tfm(transform_translate(-loc) * transform_scale(size) *
- transform_inverse(get_transform(b_ob.matrix_world())));
+ transform_inverse(get_transform(b_ob.matrix_world())));
}
}
else if (b_node.is_a(&RNA_ShaderNodeBevel)) {
@@ -1391,15 +1393,16 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d,
mix_intensity->set_mix_type(NODE_MIX_MUL);
mix_intensity->set_fac(1.0f);
mix_intensity->set_color2(make_float3(new_viewport_parameters.studiolight_intensity,
- new_viewport_parameters.studiolight_intensity,
- new_viewport_parameters.studiolight_intensity));
+ new_viewport_parameters.studiolight_intensity,
+ new_viewport_parameters.studiolight_intensity));
graph->add(mix_intensity);
TextureCoordinateNode *texture_coordinate = graph->create_node<TextureCoordinateNode>();
graph->add(texture_coordinate);
MixNode *mix_background_with_environment = graph->create_node<MixNode>();
- mix_background_with_environment->set_fac(new_viewport_parameters.studiolight_background_alpha);
+ mix_background_with_environment->set_fac(
+ new_viewport_parameters.studiolight_background_alpha);
mix_background_with_environment->set_color1(world_color);
graph->add(mix_background_with_environment);
@@ -1454,7 +1457,8 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d,
if (background->get_transparent()) {
background->set_transparent_glass(get_boolean(cscene, "film_transparent_glass"));
- background->set_transparent_roughness_threshold(get_float(cscene, "film_transparent_roughness"));
+ background->set_transparent_roughness_threshold(
+ get_float(cscene, "film_transparent_roughness"));
}
else {
background->set_transparent_glass(false);
@@ -1462,7 +1466,7 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d,
}
background->set_use_shader(view_layer.use_background_shader |
- viewport_parameters.custom_viewport_parameters());
+ viewport_parameters.custom_viewport_parameters());
background->set_use_ao(background->get_use_ao() && view_layer.use_background_ao);
if (background->is_modified())
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 2eff90b51d7..78cc248556a 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -270,7 +270,7 @@ void BlenderSync::sync_integrator()
integrator->set_volume_max_steps(get_int(cscene, "volume_max_steps"));
float volume_step_rate = (preview) ? get_float(cscene, "volume_preview_step_rate") :
- get_float(cscene, "volume_step_rate");
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list