griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Jacques Lucke
2025-10-17 13:11:12 +02:00
parent facb17b0e3 ba0f73d076
commit 81296027a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/nodes/compositing_nodes_essentials.blend (Stored with Git LFS)
View File

Binary file not shown.

2
source/blender/blenkernel/intern/grease_pencil.cc
View File

@@ -4416,8 +4416,8 @@ static void write_drawing_array(GreasePencil &grease_pencil,
curves.blend_write_prepare(write_data); curves.blend_write_prepare(write_data);
drawing_copy.runtime = nullptr; drawing_copy.runtime = nullptr;
BLO_write_struct_at_address(writer, GreasePencilDrawing, drawing_base, &drawing_copy);
curves.blend_write(*writer, grease_pencil.id, write_data); curves.blend_write(*writer, grease_pencil.id, write_data);
BLO_write_struct_at_address(writer, GreasePencilDrawing, drawing_base, &drawing_copy);
break; break;
} }
case GP_DRAWING_REFERENCE: { case GP_DRAWING_REFERENCE: {