blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Cleanup: add missing trailing underscores for private data members

This commit is contained in:
Jacques Lucke 2023-01-03 12:40:17 +01:00
parent 30753f7692
commit 1a9cf9c745
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc
View File

@ -93,10 +93,10 @@ static VArray<float3> construct_uv_gvarray(const Mesh &mesh,
class PackIslandsFieldInput final : public bke::MeshFieldInput {
private:
const Field<bool> selection_field;
const Field<float3> uv_field;
const bool rotate;
const float margin;
const Field<bool> selection_field_;
const Field<float3> uv_field_;
const bool rotate_;
const float margin_;
public:
PackIslandsFieldInput(const Field<bool> selection_field,
@ -104,10 +104,10 @@ class PackIslandsFieldInput final : public bke::MeshFieldInput {
const bool rotate,
const float margin)
: bke::MeshFieldInput(CPPType::get<float3>(), "Pack UV Islands Field"),
selection_field(selection_field),
uv_field(uv_field),
rotate(rotate),
margin(margin)
selection_field_(selection_field),
uv_field_(uv_field),
rotate_(rotate),
margin_(margin)
{
category_ = Category::Generated;
}
@ -116,13 +116,13 @@ class PackIslandsFieldInput final : public bke::MeshFieldInput {
const eAttrDomain domain,
const IndexMask /*mask*/) const final
{
return construct_uv_gvarray(mesh, selection_field, uv_field, rotate, margin, domain);
return construct_uv_gvarray(mesh, selection_field_, uv_field_, rotate_, margin_, domain);
}
void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
{
selection_field.node().for_each_field_input_recursive(fn);
uv_field.node().for_each_field_input_recursive(fn);
selection_field_.node().for_each_field_input_recursive(fn);
uv_field_.node().for_each_field_input_recursive(fn);
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const override

26
source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc
View File

@ -132,11 +132,11 @@ static VArray<float3> construct_uv_gvarray(const Mesh &mesh,
class UnwrapFieldInput final : public bke::MeshFieldInput {
private:
const Field<bool> selection;
const Field<bool> seam;
const bool fill_holes;
const float margin;
const GeometryNodeUVUnwrapMethod method;
const Field<bool> selection_;
const Field<bool> seam_;
const bool fill_holes_;
const float margin_;
const GeometryNodeUVUnwrapMethod method_;
public:
UnwrapFieldInput(const Field<bool> selection,
@ -145,11 +145,11 @@ class UnwrapFieldInput final : public bke::MeshFieldInput {
const float margin,
const GeometryNodeUVUnwrapMethod method)
: bke::MeshFieldInput(CPPType::get<float3>(), "UV Unwrap Field"),
selection(selection),
seam(seam),
fill_holes(fill_holes),
margin(margin),
method(method)
selection_(selection),
seam_(seam),
fill_holes_(fill_holes),
margin_(margin),
method_(method)
{
category_ = Category::Generated;
}
@ -158,13 +158,13 @@ class UnwrapFieldInput final : public bke::MeshFieldInput {
const eAttrDomain domain,
const IndexMask /*mask*/) const final
{
return construct_uv_gvarray(mesh, selection, seam, fill_holes, margin, method, domain);
return construct_uv_gvarray(mesh, selection_, seam_, fill_holes_, margin_, method_, domain);
}
void for_each_field_input_recursive(FunctionRef<void(const FieldInput &)> fn) const
{
selection.node().for_each_field_input_recursive(fn);
seam.node().for_each_field_input_recursive(fn);
selection_.node().for_each_field_input_recursive(fn);
seam_.node().for_each_field_input_recursive(fn);
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const override