aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorehriche2015-05-06 00:56:59 +0200
committerehriche2015-05-06 01:22:31 +0200
commit897a1aade5332753d9fda950d80495798cdc85b4 (patch)
tree53f4cab913ef39a1563704751df07d43ebfef42f /tools
parentfe13c728fd44a1271f218685fc73ed4ba8d3ce7a (diff)
downloadgodot-897a1aade5332753d9fda950d80495798cdc85b4.tar.gz
godot-897a1aade5332753d9fda950d80495798cdc85b4.tar.zst
godot-897a1aade5332753d9fda950d80495798cdc85b4.zip
optional formal changes
Diffstat (limited to 'tools')
-rw-r--r--tools/docdump/doc_dump.cpp2
-rw-r--r--tools/editor/animation_editor.cpp2
-rw-r--r--tools/editor/editor_file_system.cpp8
-rw-r--r--tools/editor/io_plugins/editor_texture_import_plugin.cpp2
-rw-r--r--tools/editor/plugins/shader_graph_editor_plugin.cpp1
-rw-r--r--tools/editor/spatial_editor_gizmos.cpp3
6 files changed, 10 insertions, 8 deletions
diff --git a/tools/docdump/doc_dump.cpp b/tools/docdump/doc_dump.cpp
index d10f6c9ce..17aff3dc7 100644
--- a/tools/docdump/doc_dump.cpp
+++ b/tools/docdump/doc_dump.cpp
@@ -65,7 +65,7 @@ static String _escape_string(const String& p_str) {
ret=ret.replace(">","<");
ret=ret.replace("'","'");
ret=ret.replace("\"",""");
- for (int i=1;i<32;i++) {
+ for (char i=1;i<32;i++) {
char chr[2]={i,0};
ret=ret.replace(chr,"&#"+String::num(i)+";");
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index 39eec4e69..63ab186a3 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -1375,7 +1375,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) {
if (p_input.is_action("ui_up"))
selected_track--;
if (v_scroll->is_visible() && p_input.is_action("ui_page_up"))
- selected_track--;;
+ selected_track--;
if (selected_track<0)
selected_track=0;
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index 94e887c3e..8e96123c3 100644
--- a/tools/editor/editor_file_system.cpp
+++ b/tools/editor/editor_file_system.cpp
@@ -940,19 +940,19 @@ String EditorFileSystem::get_file_type(const String& p_file) const {
EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) {
if (!filesystem || scanning)
- return false;
+ return NULL;
String f = Globals::get_singleton()->localize_path(p_path);
if (!f.begins_with("res://"))
- return false;
+ return NULL;
f=f.substr(6,f.length());
f=f.replace("\\","/");
if (f==String())
- return filesystem;
+ return filesystem;
if (f.ends_with("/"))
f=f.substr(0,f.length()-1);
@@ -960,7 +960,7 @@ EditorFileSystemDirectory *EditorFileSystem::get_path(const String& p_path) {
Vector<String> path = f.split("/");
if (path.size()==0)
- return false;
+ return NULL;
EditorFileSystemDirectory *fs=filesystem;
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 64b5d5b33..3add30d81 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -51,6 +51,7 @@ static const char *flag_names[]={
NULL
};
+#if 0 // not used
static const char *flag_short_names[]={
"Stream",
"FixBorder",
@@ -65,6 +66,7 @@ static const char *flag_short_names[]={
"Anisoropic",
NULL
};
+#endif
void EditorImportTextureOptions::set_format(EditorTextureImportPlugin::ImageFormat p_format) {
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp
index 1db901e56..03fcbffa2 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp
@@ -539,7 +539,6 @@ void GraphCurveMapEdit::_plot_curve(const Vector2& p_a,const Vector2& p_b,const
if ((lastx != newx) || (lasty != newy))
{
#if 0
- /*
if(fix255)
{
/* use fixed array size (for the curve graph) */
diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp
index f9d92c8d8..521a10bbd 100644
--- a/tools/editor/spatial_editor_gizmos.cpp
+++ b/tools/editor/spatial_editor_gizmos.cpp
@@ -1257,7 +1257,8 @@ void SkeletonSpatialGizmo::redraw() {
//find closest axis
int closest=-1;
- float closest_d;
+ float closest_d = 0.0;
+
for(int j=0;j<3;j++) {
float dp = Math::abs(grests[parent].basis[j].normalized().dot(d));
if (j==0 || dp>closest_d)