[Bf-blender-cvs] [8e806d40046] cycles_procedural_api: run clang format
Kévin Dietrich
noreply at git.blender.org
Tue Oct 6 07:19:00 CEST 2020
Commit: 8e806d400467a7d7a09db7ed86acaaf2eeefe97c
Author: Kévin Dietrich
Date: Tue Oct 6 06:41:01 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB8e806d400467a7d7a09db7ed86acaaf2eeefe97c
run clang format
===================================================================
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/render/alembic.cpp
M intern/cycles/render/geometry.cpp
M intern/cycles/render/mesh.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 4cf5d08080a..eedd55ba3b0 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -49,7 +49,7 @@ struct MikkUserData {
: mesh(mesh), texface(NULL), orco(NULL), tangent(tangent), tangent_sign(tangent_sign)
{
const AttributeSet &attributes = (mesh->get_num_subd_faces()) ? mesh->subd_attributes :
- mesh->attributes;
+ mesh->attributes;
Attribute *attr_vN = attributes.find(ATTR_STD_VERTEX_NORMAL);
vertex_normal = attr_vN->data_float3();
@@ -222,7 +222,8 @@ static void mikk_compute_tangents(
const BL::Mesh &b_mesh, const char *layer_name, Mesh *mesh, bool need_sign, bool active_render)
{
/* Create tangent attributes. */
- AttributeSet &attributes = (mesh->get_num_subd_faces()) ? mesh->subd_attributes : mesh->attributes;
+ AttributeSet &attributes = (mesh->get_num_subd_faces()) ? mesh->subd_attributes :
+ mesh->attributes;
Attribute *attr;
ustring name;
if (layer_name != NULL) {
diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index fc9ab763ed4..a5d75c392dd 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -295,11 +295,11 @@ void AlembicObject::load_all_data(const IPolyMeshSchema &schema)
read_default_uvs(uvs, iss, data_cache);
}
-// const IN3fGeomParam &normals = schema.getNormalsParam();
+ // const IN3fGeomParam &normals = schema.getNormalsParam();
-// if (normals.valid()) {
-// read_default_normals(normals, iss, data_cache);
-// }
+ // if (normals.valid()) {
+ // read_default_normals(normals, iss, data_cache);
+ // }
foreach (const AttributeRequest &attr, requested_attributes.requests) {
read_attribute(schema.getArbGeomParams(), iss, attr.name, data_cache);
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index f7ccf858e09..b08982dd4c1 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1300,7 +1300,8 @@ void GeometryManager::device_update(Device *device,
});
Camera *dicing_camera = scene->dicing_camera;
- dicing_camera->set_screen_size_and_resolution(dicing_camera->get_full_width(), dicing_camera->get_full_height(), 1);
+ dicing_camera->set_screen_size_and_resolution(
+ dicing_camera->get_full_width(), dicing_camera->get_full_height(), 1);
dicing_camera->update(scene);
size_t i = 0;
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 5786aeff22b..da026b5baf4 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -362,7 +362,8 @@ void Mesh::add_subd_face(int *corners, int num_corners, int shader_, bool smooth
}
int ptex_offset = 0;
- // cannot use get_num_subd_faces here as it holds the total number of subd_faces, but we do not have the total amount of data yet
+ // cannot use get_num_subd_faces here as it holds the total number of subd_faces, but we do not
+ // have the total amount of data yet
if (subd_shader.size()) {
SubdFace s = get_subd_face(subd_shader.size() - 1);
ptex_offset = s.ptex_offset + s.num_ptex_faces();
More information about the Bf-blender-cvs
mailing list