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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Clément Foucault
2025-03-10 13:07:47 +01:00
parent 674c315182 690a165630
commit 86d7f1bcee
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/draw/engines/overlay/overlay_next_instance.cc
View File

@@ -1015,12 +1015,16 @@ bool Instance::object_needs_prepass(const ObjectRef &ob_ref, bool in_paint_mode)
if (in_paint_mode) {
/* Allow paint overlays to draw with depth equal test. */
return object_is_rendered_transparent(ob_ref.object, state);
if (object_is_rendered_transparent(ob_ref.object, state)) {
return true;
}
}
if (!state.xray_enabled) {
/* Force depth prepass if depth buffer form render engine is not available. */
return !state.is_render_depth_available && (ob_ref.object->dt >= OB_SOLID);
if (!state.is_render_depth_available && (ob_ref.object->dt >= OB_SOLID)) {
return true;
}
}
return false;

2
source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc
View File

@@ -245,7 +245,7 @@ static void control_point_colors_and_sizes(const PrimitiveToolOperation &ptd,
}
colors.last() = color_gizmo_primary;
sizes.last() = size_primary;
sizes.last() = size_tertiary;
if (ELEM(ptd.type, PrimitiveType::Line, PrimitiveType::Polyline)) {
colors.last(1) = color_gizmo_secondary;