Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #67578 from KoBeWi/GEDITOR

Browse source 
Unify usage of GLOBAL/EDITOR_GET
This commit is contained in:
Rémi Verschelde 2022-10-31 13:15:58 +01:00
commit 5947f22be9
No known key found for this signature in database
GPG key ID: C3336907360768E1
113 changed files with 528 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/android/java_godot_lib_jni.cpp
View file

@ -409,7 +409,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env,
JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path) {
String js = jstring_to_string(path, env);
return env->NewStringUTF(ProjectSettings::get_singleton()->get(js).operator String().utf8().get_data());
return env->NewStringUTF(GLOBAL_GET(js).operator String().utf8().get_data());
}
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params) {