Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-04-07 21:23:32 +0300
committerHans Goudey <h.goudey@me.com>2021-04-07 21:23:32 +0300
commit1a8db9ec04d53d6b9d40d463001b84684e5a8e76 (patch)
tree952e050b6fc2d7f7b67faf7a190c0be21e6d9060 /source/blender/nodes
parent22ba85b510210d623e06174d0b73996585bf36fc (diff)
Geometry Nodes: Rename grid output UV attribute
During review of D10730 it was discovered that the "uv" name causes issues for cycles, which uses it as a default internal data name. While that could be fixed in the future, there was no particular reason to use "uv" instead of "uv_map", so we use the latter instead here, which is consistent with the lowercase naming scheme chosen for attributes.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
index 17f69886276..5bdea946238 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc
@@ -48,7 +48,7 @@ static void calculate_uvs(
MeshComponent mesh_component;
mesh_component.replace(mesh, GeometryOwnershipType::Editable);
OutputAttributePtr uv_attribute = mesh_component.attribute_try_get_for_output(
- "uv", ATTR_DOMAIN_CORNER, CD_PROP_FLOAT2, nullptr);
+ "uv_map", ATTR_DOMAIN_CORNER, CD_PROP_FLOAT2, nullptr);
MutableSpan<float2> uvs = uv_attribute->get_span_for_write_only<float2>();
const float dx = (size_x == 0.0f) ? 0.0f : 1.0f / size_x;