[Bf-blender-cvs] [2500f65b0b3] cycles_procedural_api: cleanup, format
Kévin Dietrich
noreply at git.blender.org
Sat Oct 3 04:18:22 CEST 2020
Commit: 2500f65b0b365a447971b8e140f4218e010b8d73
Author: Kévin Dietrich
Date: Mon Sep 28 14:53:57 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB2500f65b0b365a447971b8e140f4218e010b8d73
cleanup, format
===================================================================
M intern/cycles/render/alembic.cpp
M intern/cycles/render/alembic.h
===================================================================
diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index 1ad2d0bf4b8..403b2fa62b3 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -66,7 +66,9 @@ static Transform make_transform(const Abc::M44d &a)
return trans;
}
-static void read_default_uvs(const IV2fGeomParam &uvs, const ISampleSelector &iss, AlembicObject::DataCache &data_cache)
+static void read_default_uvs(const IV2fGeomParam &uvs,
+ const ISampleSelector &iss,
+ AlembicObject::DataCache &data_cache)
{
switch (uvs.getScope()) {
case kFacevaryingScope: {
@@ -212,7 +214,8 @@ void AlembicObject::load_all_data(const IPolyMeshSchema &schema)
int v2 = face_indices_array[index_offset + j + 2];
data_cache.triangles.push_back_reserved(make_int3(v0, v1, v2));
- data_cache.triangles_loops.push_back_reserved(make_int3(index_offset, index_offset + j + 1, index_offset + j + 2));
+ data_cache.triangles_loops.push_back_reserved(
+ make_int3(index_offset, index_offset + j + 1, index_offset + j + 2));
}
index_offset += face_counts_array[i];
@@ -233,7 +236,10 @@ void AlembicObject::load_all_data(const IPolyMeshSchema &schema)
data_loaded = true;
}
-void AlembicObject::read_attribute(const ICompoundProperty &arb_geom_params, const ISampleSelector &iss, const ustring &attr_name, DataCache &data_cache)
+void AlembicObject::read_attribute(const ICompoundProperty &arb_geom_params,
+ const ISampleSelector &iss,
+ const ustring &attr_name,
+ DataCache &data_cache)
{
for (size_t i = 0; i < arb_geom_params.getNumProperties(); ++i) {
const PropertyHeader &prop = arb_geom_params.getPropertyHeader(i);
diff --git a/intern/cycles/render/alembic.h b/intern/cycles/render/alembic.h
index 0a894ab07bf..123f40e4d41 100644
--- a/intern/cycles/render/alembic.h
+++ b/intern/cycles/render/alembic.h
@@ -56,11 +56,11 @@ class AlembicObject : public Node {
// TODO : handle attributes as well
struct AttributeData {
- AttributeStandard std;
- AttributeElement element;
- TypeDesc type_desc;
- ustring name;
- array<char> data;
+ AttributeStandard std;
+ AttributeElement element;
+ TypeDesc type_desc;
+ ustring name;
+ array<char> data;
};
struct DataCache {
@@ -86,7 +86,10 @@ class AlembicObject : public Node {
vector<DataCache> frame_data;
- void read_attribute(const ICompoundProperty &arb_geom_params, const ISampleSelector &iss, const ustring &attr_name, DataCache &data_cache);
+ void read_attribute(const ICompoundProperty &arb_geom_params,
+ const ISampleSelector &iss,
+ const ustring &attr_name,
+ DataCache &data_cache);
};
class AlembicProcedural : public Procedural {
More information about the Bf-blender-cvs
mailing list