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

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Campbell Barton
2023-10-13 10:31:44 +11:00
parent 4320f1a217 fb58aa5900
commit e86fbcd4f0
9 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/realtime_compositor/shaders/compositor_summed_area_table_compute_complete_x_prologues.glsl
View File

@@ -24,7 +24,7 @@ void main()
/* Note that the first row of sums is the result of summing the prologues of a virtual block
* that is before the first row of blocks and we assume that those prologues are all zeros,
* so we set the sum to zero in that case. This is implemented by setting the sums of the
* first vertical work-group to zero, white latter work-groups are summed as as usual and
* first vertical work-group to zero, white latter work-groups are summed as usual and
* stored starting from the second row. */
imageStore(complete_x_prologues_sum_img, ivec2(y, 0), vec4(0.0));
}

2
source/blender/compositor/realtime_compositor/shaders/library/gpu_shader_compositor_image_diagonals.glsl
View File

@@ -109,7 +109,7 @@ ivec2 get_diagonal_direction()
/* Computes the number of values in the anti diagonal of the given index in the matrix with the
* given size, where the anti diagonals are indexed from the lower left corner to the upper right
* corner such that that their start is at the bottom and right edges of the matrix as shown in the
* corner such that their start is at the bottom and right edges of the matrix as shown in the
* diagram below. The numbers in the diagram denote the index of the anti diagonal and its length.
*
* Width = 6

2
source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl
View File

@@ -111,7 +111,7 @@ void main()
FragColor = vec4(sh, 1.0);
#else
# if defined(IRRADIANCE_HL2)
/* Downside: very very low resolution (6 texels), bleed lighting because of interpolation */
/* Downside: extremely low resolution (6 texels), bleed lighting because of interpolation */
int x = int(gl_FragCoord.x) % 3;
int y = int(gl_FragCoord.y) % 2;

2
source/blender/editors/animation/keyframes_general.cc
View File

@@ -806,7 +806,7 @@ bool match_slope_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float
const BezTriple *reference_key;
if (factor >= 0) {
/* Stop the function if there is no key beyond the the right neighboring one. */
/* Stop the function if there is no key beyond the right neighboring one. */
if (segment->start_index + segment->length >= fcu->totvert - 1) {
return false;
}

2
source/blender/editors/interface/interface_handlers.cc
View File

@@ -10325,7 +10325,7 @@ static int ui_handle_menu_letter_press_search(uiPopupBlockHandle *menu, const wm
WM_operator_properties_create_ptr(after->opptr, ot);
RNA_string_set(after->opptr, "menu_idname", menu->menu_idname);
if (event->type != EVT_SPACEKEY) {
/* Forward all keys except spacebar to the search. */
/* Forward all keys except space-bar to the search. */
const int num_bytes = BLI_str_utf8_size_or_error(event->utf8_buf);
if (num_bytes != -1) {
char buf[sizeof(event->utf8_buf) + 1];

4
source/blender/gpu/shaders/common/gpu_shader_math_matrix_lib.glsl
View File

@@ -92,7 +92,7 @@ mat4x4 invert(mat4x4 mat, out bool r_success);
/**
* Flip the matrix across its diagonal. Also flips dimensions for non square matrices.
*/
// mat3x3 transpose(mat3x3 mat); /* Built-In in GLSL language. */
// mat3x3 transpose(mat3x3 mat); /* Built-In using GLSL language. */
/**
* Normalize each column of the matrix individually.
@@ -125,7 +125,7 @@ mat4x4 normalize_and_get_size(mat4x4 mat, out vec4 r_size);
* Returns the determinant of the matrix.
* It can be interpreted as the signed volume (or area) of the unit cube after transformation.
*/
// float determinant(mat3x3 mat); /* Built-In in GLSL language. */
// float determinant(mat3x3 mat); /* Built-In using GLSL language. */
/**
* Returns the adjoint of the matrix (also known as adjugate matrix).

4
source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert_no_geom.glsl
View File

@@ -322,7 +322,7 @@ void main(void)
bool end_endcap = (gpencil_stroke_data.caps_end != GPENCIL_FLATCAP) && is_equal(P1, P3);
switch (output_prim_triangle_id) {
/* -- Start end cap. -*/
/* -- Start: end cap. -*/
case 1:
EMIT_VERTEX_COND(vertex_in_triangle, start_endcap, V3, V4, V5)
case 2:
@@ -334,7 +334,7 @@ void main(void)
EMIT_VERTEX(vertex_in_triangle, V6, V7, V8)
case 5:
EMIT_VERTEX(vertex_in_triangle, V7, V8, V9)
/* -- End end cap. -- */
/* -- End: end cap. -- */
case 6:
EMIT_VERTEX_COND(vertex_in_triangle, end_endcap, V8, V9, V10)
case 7:

2
source/blender/render/intern/engine.cc
View File

@@ -1174,7 +1174,7 @@ bool RE_engine_draw_acquire(Render *re)
*
* In the former case there will nothing to be drawn, so can simply use RenderResult drawing
* pipeline. In the latter case the engine has destroyed its display-only resources (textures,
* graphics interops, etc..) so need to use use the RenderResult drawing pipeline. */
* graphics interops, etc..) so need to use the #RenderResult drawing pipeline. */
BLI_mutex_unlock(&re->engine_draw_mutex);
return false;
}

3
source/blender/windowmanager/intern/wm_playanim.cc
View File

@@ -953,8 +953,9 @@ static void build_pict_list(GhostData *ghost_data,
bool do_image_load = false;
if (IMB_isanim(filepath_first)) {
build_pict_list_from_anim(ghost_data, display_ctx, filepath_first, frame_offset);
if (picsbase.last == picture_last) {
/* FFMPEG detected JPEG200 as a video which would load with zero duration.
/* FFMPEG detected JPEG2000 as a video which would load with zero duration.
* Resolve this by using images as a fallback when a video file has no frames to display. */
do_image_load = true;
}