seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix disallow stencil mode outline and xray for RENDER_PRIORITY_MAX

Browse Source
This commit is contained in:
Squamto
2025-07-28 17:39:54 +02:00
parent 2d113cc224
commit cd737eed2f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/resources/material.cpp
View File

@ -64,6 +64,7 @@ Ref<Material> Material::get_next_pass() const {
void Material::set_render_priority(int p_priority) { void Material::set_render_priority(int p_priority) {
ERR_FAIL_COND(p_priority < RENDER_PRIORITY_MIN); ERR_FAIL_COND(p_priority < RENDER_PRIORITY_MIN);
ERR_FAIL_COND(p_priority > RENDER_PRIORITY_MAX); ERR_FAIL_COND(p_priority > RENDER_PRIORITY_MAX);
render_priority = p_priority; render_priority = p_priority;
if (material.is_valid()) { if (material.is_valid()) {
@ -3217,6 +3218,11 @@ void BaseMaterial3D::set_stencil_mode(StencilMode p_stencil_mode) {
return; return;
} }
if (p_stencil_mode == StencilMode::STENCIL_MODE_OUTLINE || p_stencil_mode == StencilMode::STENCIL_MODE_XRAY) {
ERR_FAIL_COND_EDMSG(get_render_priority() >= RENDER_PRIORITY_MAX,
vformat("Cannot use stencil mode Outline or Xray, when render priority is RENDER_PRIORITY_MAX(%d).", RENDER_PRIORITY_MAX));
}
stencil_mode = p_stencil_mode; stencil_mode = p_stencil_mode;
_prepare_stencil_effect(); _prepare_stencil_effect();
_queue_shader_change(); _queue_shader_change();