瀏覽代碼

Fix various property not found errors

Poommetee Ketson 8 年之前
父節點
當前提交
0154098531
共有 3 個文件被更改,包括 5 次插入2 次删除
  1. 3 0
      core/io/resource_loader.cpp
  2. 1 1
      drivers/gles3/rasterizer_storage_gles3.cpp
  3. 1 1
      servers/visual_server.cpp

+ 3 - 0
core/io/resource_loader.cpp

@@ -430,6 +430,9 @@ void ResourceLoader::reload_translation_remaps() {
 
 
 void ResourceLoader::load_translation_remaps() {
 void ResourceLoader::load_translation_remaps() {
 
 
+	if (!ProjectSettings::get_singleton()->has("locale/translation_remaps"))
+		return;
+
 	Dictionary remaps = ProjectSettings::get_singleton()->get("locale/translation_remaps");
 	Dictionary remaps = ProjectSettings::get_singleton()->get("locale/translation_remaps");
 	List<Variant> keys;
 	List<Variant> keys;
 	remaps.get_key_list(&keys);
 	remaps.get_key_list(&keys);

+ 1 - 1
drivers/gles3/rasterizer_storage_gles3.cpp

@@ -6915,7 +6915,7 @@ void RasterizerStorageGLES3::initialize() {
 	config.use_anisotropic_filter = config.extensions.has("GL_EXT_texture_filter_anisotropic");
 	config.use_anisotropic_filter = config.extensions.has("GL_EXT_texture_filter_anisotropic");
 	if (config.use_anisotropic_filter) {
 	if (config.use_anisotropic_filter) {
 		glGetFloatv(_GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &config.anisotropic_level);
 		glGetFloatv(_GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &config.anisotropic_level);
-		config.anisotropic_level = MIN(int(ProjectSettings::get_singleton()->get("rendering/quality/anisotropic_filter_level")), config.anisotropic_level);
+		config.anisotropic_level = MIN(int(ProjectSettings::get_singleton()->get("rendering/quality/filters/anisotropic_filter_level")), config.anisotropic_level);
 	}
 	}
 
 
 	frame.clear_request = false;
 	frame.clear_request = false;

+ 1 - 1
servers/visual_server.cpp

@@ -1576,7 +1576,7 @@ VisualServer::VisualServer() {
 	GLOBAL_DEF("rendering/quality/directional_shadow/size.mobile", 2048);
 	GLOBAL_DEF("rendering/quality/directional_shadow/size.mobile", 2048);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/size", 4096);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/size", 4096);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/size.mobile", 2048);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/size.mobile", 2048);
-	ProjectSettings::get_singleton()->set_custom_property_info("rendering/shadow_atlas/size", PropertyInfo(Variant::INT, "rendering/shadow_atlas/size", PROPERTY_HINT_RANGE, "256,16384"));
+	ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/shadow_atlas/size", PropertyInfo(Variant::INT, "rendering/quality/shadow_atlas/size", PROPERTY_HINT_RANGE, "256,16384"));
 	GLOBAL_DEF("rendering/quality/shadow_atlas/quadrant_0_subdiv", 1);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/quadrant_0_subdiv", 1);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/quadrant_1_subdiv", 2);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/quadrant_1_subdiv", 2);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/quadrant_2_subdiv", 3);
 	GLOBAL_DEF("rendering/quality/shadow_atlas/quadrant_2_subdiv", 3);