blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 749 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1378e0e13 - Show all commits

10
source/blender/draw/intern/draw_cache_impl_grease_pencil.cc
View File

@ -272,15 +272,15 @@ static void grease_pencil_batches_ensure(GreasePencil &grease_pencil, int cfra)
const Span<float3> positions = curves.positions();
const VArray<bool> cyclic = curves.cyclic();
const VArray<float> radii = attributes.lookup_or_default<float>(
Hans Goudey commented 2023-04-25 04:13:57 +02:00
Outdated
Review
Copy Link

Use the * overload rather than adding .varray at the end

Use the `*` overload rather than adding `.varray` at the end
"radius", ATTR_DOMAIN_POINT, 1.0f);
"radius", ATTR_DOMAIN_POINT, 1.0f).varray;
const VArray<float> opacities = attributes.lookup_or_default<float>(
"opacity", ATTR_DOMAIN_POINT, 1.0f);
"opacity", ATTR_DOMAIN_POINT, 1.0f).varray;
const VArray<int8_t> start_caps = attributes.lookup_or_default<int8_t>(
"start_cap", ATTR_DOMAIN_CURVE, 0);
"start_cap", ATTR_DOMAIN_CURVE, 0).varray;
const VArray<int8_t> end_caps = attributes.lookup_or_default<int8_t>(
"end_cap", ATTR_DOMAIN_CURVE, 0);
"end_cap", ATTR_DOMAIN_CURVE, 0).varray;
const VArray<int> materials = attributes.lookup_or_default<int>(
"material_index", ATTR_DOMAIN_CURVE, -1);
"material_index", ATTR_DOMAIN_CURVE, -1).varray;
const Span<uint3> triangles = drawing.triangles();
const Span<int> verts_start_offsets =
verts_start_offsets_per_visible_drawing[drawing_i].as_span();
Hans Goudey commented 2023-04-25 04:16:22 +02:00
Outdated
Review
Copy Link

These .as_span() calls shouldn't be necessary

These `.as_span()` calls shouldn't be necessary