Merge pull request #5920 from 29jm/fix-warnings

Fix some more warnings
This commit is contained in:
Juan Linietsky
2016-09-10 12:21:02 -03:00
committed by GitHub
25 changed files with 60 additions and 61 deletions

View File

@@ -2052,6 +2052,7 @@ Error Image::_decompress_bc() {
ht/=2;
} break;
default: {}
}
}

View File

@@ -157,7 +157,10 @@ bool Triangulate::triangulate(const Vector<Vector2> &contour,Vector<int> &result
m++;
/* remove v from remaining polygon */
for(s=v,t=v+1;t<nv;s++,t++) V[s] = V[t]; nv--;
for(s=v,t=v+1;t<nv;s++,t++)
V[s] = V[t];
nv--;
/* resest error detection counter */
count = 2*nv;

View File

@@ -1644,6 +1644,7 @@ void Object::_clear_internal_resource_paths(const Variant &p_var) {
_clear_internal_resource_paths(d[E->get()]);
}
} break;
default: {}
}
}

View File

@@ -866,21 +866,14 @@ MethodBind* ObjectTypeDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind , c
Vector<Variant> defvals;
#define PARSE_DEFVAL(m_defval)\
if (d##m_defval.used) defvals.insert(0,d##m_defval.val);\
else goto set_defvals;
defvals.resize(p_defcount);
for(int i=0;i<p_defcount;i++) {
defvals[i]=*p_defs[p_defcount-i-1];
}
set_defvals:
p_bind->set_default_arguments(defvals);
p_bind->set_hint_flags(p_flags);
#undef PARSE_DEFVAL
return p_bind;
}