griefith/test2
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 14:41:18 +02:00
parent dbe44027c2 c990cd6759
commit 0f71665e4e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/sky/source/sky_multiple_scattering.cpp
View File

@@ -319,7 +319,7 @@ void SKY_multiple_scattering_precompute_texture(float *pixels,
const float3 sun_dir = sun_direction(sun_zenith_cos_angle);
const int rows_per_task = std::max(1024 / width, 1);
SKY_parallel_for(0, height, rows_per_task, [=](const size_t begin, const size_t end) {
SKY_parallel_for(0, height, rows_per_task, [&](const size_t begin, const size_t end) {
for (int y = begin; y < end; y++) {
float *pixel_row = pixels + (y * width * stride);
for (int x = 0; x < half_width; x++) {

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

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