Removed repeated unused effective_tex_scale for preview bake

Sunfly-Studios · Aug 7, 2024 · aa4b27b · aa4b27b
1 parent ab5511e
commit aa4b27b
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp
@@ -974,17 +974,9 @@ LightmapGI::BakeError LightmapGI::bake(Node *p_from_node, String p_image_data_pa
 
 	LightmapGI::BakeQuality effective_bake_quality = bake_quality;
 	int effective_bounces = bounces;
-<<<<<<< HEAD
 	LightmapGI::GenerateProbes effective_gen_probes = gen_probes;
 	if (p_preview_bake) {
 		// Use lower-quality settings for quick iteration.
-=======
-	float effective_texel_scale = texel_scale;
-	LightmapGI::GenerateProbes effective_gen_probes = gen_probes;
-	if (p_preview_bake) {
-		// Use lower-quality settings for quick iteration.
-		effective_texel_scale *= float(GLOBAL_GET("rendering/lightmapping/preview_bake/texel_scale_factor"));
->>>>>>> 9b2140662f (Add a Preview Bake button for quick iteration with LightmapGI)
 		effective_bake_quality = MIN(bake_quality, LightmapGI::BakeQuality(int(GLOBAL_GET("rendering/lightmapping/preview_bake/max_quality"))));
 		effective_bounces = MIN(bounces, int(GLOBAL_GET("rendering/lightmapping/preview_bake/max_bounces")));
 		effective_gen_probes = MIN(gen_probes, LightmapGI::GenerateProbes(int(GLOBAL_GET("rendering/lightmapping/preview_bake/generate_probes_max_subdiv"))));