seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style: Sync other changes from new fix_style.sh and clang_format.sh

Browse Source
This commit is contained in:
Rémi Verschelde
2020-07-24 10:26:41 +02:00
parent eda03831d6
commit b40f3f9740
74 changed files with 116 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/arkit/arkit_session_delegate.mm
View File

@ -53,4 +53,4 @@
}
}
@end
@end

2
modules/assimp/import_utils.h
View File

@ -189,7 +189,7 @@ public:
}
/**
* Converts aiMatrix4x4 to godot Transform
* Converts aiMatrix4x4 to godot Transform
*/
static const Transform assimp_matrix_transform(const aiMatrix4x4 p_matrix) {
aiMatrix4x4 matrix = p_matrix;

2
modules/camera/camera_ios.h
View File

@ -42,4 +42,4 @@ public:
void update_feeds();
};
#endif /* CAMERAIOS_H */
#endif /* CAMERAIOS_H */

2
modules/gdnative/android/android_gdn.cpp
View File

@ -83,4 +83,4 @@ bool GDAPI godot_android_is_activity_resumed() {
#ifdef __cplusplus
}
#endif
#endif

2
modules/gdnative/nativescript/api_generator.cpp
View File

@ -140,7 +140,7 @@ static String get_type_name(const PropertyInfo &info) {
}
/*
* Some comparison helper functions we need
* Some comparison helper functions we need
*/
struct MethodInfoComparator {

2
modules/gridmap/doc_classes/README.md
View File

@ -1 +1 @@
Doc classes will appear here when generating
Doc classes will appear here when generating

6
modules/mono/csharp_script.cpp
View File

@ -1864,7 +1864,7 @@ MonoObject *CSharpInstance::_internal_new_managed() {
bool die = _unreference_owner_unsafe();
// Not ok for the owner to die here. If there is a situation where this can happen, it will be considered a bug.
CRASH_COND(die == true);
CRASH_COND(die);
owner = NULL;
@ -2203,7 +2203,7 @@ CSharpInstance::~CSharpInstance() {
// Unreference the owner here, before the new "instance binding" references it.
// Otherwise, the unsafe reference debug checks will incorrectly detect a bug.
bool die = _unreference_owner_unsafe();
CRASH_COND(die == true); // `owner_keep_alive` holds a reference, so it can't die
CRASH_COND(die); // `owner_keep_alive` holds a reference, so it can't die
void *data = owner->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index());
CRASH_COND(data == NULL);
@ -3015,7 +3015,7 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg
bool die = instance->_unreference_owner_unsafe();
// Not ok for the owner to die here. If there is a situation where this can happen, it will be considered a bug.
CRASH_COND(die == true);
CRASH_COND(die);
p_owner->set_script_instance(NULL);
r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;

2
modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;

2
modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;

6
modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs
View File

@ -141,7 +141,7 @@ namespace GodotTools.Ides.Rider
if (OS.IsOSX)
{
var home = Environment.GetEnvironmentVariable("HOME");
if (string.IsNullOrEmpty(home))
if (string.IsNullOrEmpty(home))
return string.Empty;
var localAppData = Path.Combine(home, @"Library/Application Support");
return GetToolboxRiderRootPath(localAppData);
@ -150,7 +150,7 @@ namespace GodotTools.Ides.Rider
if (OS.IsUnixLike())
{
var home = Environment.GetEnvironmentVariable("HOME");
if (string.IsNullOrEmpty(home))
if (string.IsNullOrEmpty(home))
return string.Empty;
var localAppData = Path.Combine(home, @".local/share");
return GetToolboxRiderRootPath(localAppData);
@ -322,7 +322,7 @@ namespace GodotTools.Ides.Rider
class SettingsJson
{
public string install_location;
[CanBeNull]
public static string GetInstallLocationFromJson(string json)
{