Skip to content

Commit 0fdb725

Browse files
committed
WIP
1 parent 8c16af1 commit 0fdb725

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/error/error_macros.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -793,8 +793,6 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
793793
*/
794794
#define CRASH_NOW() \
795795
if (true) { \
796-
_err_print_error(FUNCTION_STR, __FILE__, __LINE__, "FATAL: Method/function failed."); \
797-
_err_flush_stdout(); \
798796
GENERATE_TRAP(); \
799797
} else \
800798
((void)0)

servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ class SceneForwardClusteredShaderRD : public ShaderRD {
4343
// static const char _fragment_code[];
4444
// static const char *_compute_code = nullptr;
4545
ShaderLoaderRD::ShaderLoadResult res = ShaderLoaderRD::get_singleton()->load_shader_file("./shaders/forward_clustered/scene_forward_clustered.glsl");
46-
ERR_FAIL_COND_MSG(res.error, "Failed to load shader file: ./shaders/forward_clustered/scene_forward_clustered.glsl");
46+
if (res.error) {
47+
CRASH_NOW_MSG("Failed to load shader file: ./shaders/forward_clustered/scene_forward_clustered.glsl");
48+
}
4749

4850
setup(res.vertex_code, res.fragment_code, res.compute_code, "SceneForwardClusteredShaderRD");
4951
}

0 commit comments

Comments
 (0)