Explorar o código

Merge pull request #82521 from Calinou/lightmapper-disable-module-templates

Disable `lightmapper_rd` module in non-editor builds (and in Android editor)
Rémi Verschelde hai 1 ano
pai
achega
0cd47310f2

+ 1 - 1
modules/lightmapper_rd/config.py

@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return True
+    return env.editor_build and platform not in ["android", "ios"]
 
 
 def configure(env):

+ 0 - 1
modules/lightmapper_rd/register_types.cpp

@@ -58,7 +58,6 @@ void initialize_lightmapper_rd_module(ModuleInitializationLevel p_level) {
 	GLOBAL_DEF("rendering/lightmapping/bake_quality/high_quality_probe_ray_count", 512);
 	GLOBAL_DEF("rendering/lightmapping/bake_quality/ultra_quality_probe_ray_count", 2048);
 	GLOBAL_DEF("rendering/lightmapping/bake_performance/max_rays_per_probe_pass", 64);
-	GLOBAL_DEF("rendering/lightmapping/primitive_meshes/texel_size", 0.2);
 #ifndef _3D_DISABLED
 	GDREGISTER_CLASS(LightmapperRD);
 	Lightmapper::create_gpu = create_lightmapper_rd;

+ 1 - 0
servers/rendering_server.cpp

@@ -2983,6 +2983,7 @@ void RenderingServer::init() {
 	GLOBAL_DEF("rendering/limits/global_shader_variables/buffer_size", 65536);
 
 	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/lightmapping/probe_capture/update_speed", PROPERTY_HINT_RANGE, "0.001,256,0.001"), 15);
+	GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/lightmapping/primitive_meshes/texel_size", PROPERTY_HINT_RANGE, "0.001,100,0.001"), 0.2);
 
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/global_illumination/sdfgi/probe_ray_count", PROPERTY_HINT_ENUM, "8 (Fastest),16,32,64,96,128 (Slowest)"), 1);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/global_illumination/sdfgi/frames_to_converge", PROPERTY_HINT_ENUM, "5 (Less Latency but Lower Quality),10,15,20,25,30 (More Latency but Higher Quality)"), 5);