godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Style: Fix statements ending with ';;' 

(cherry picked from commit f44ee891be)
This commit is contained in:
Rémi Verschelde 2017-01-14 18:03:38 +01:00
parent 75bf6a9978
commit dbf0137576
98 changed files with 202 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/image.cpp
View File

@ -750,7 +750,7 @@ void Image::flip_y() {
bool gm=mipmaps; bool gm=mipmaps;
if (gm) if (gm)
clear_mipmaps();; clear_mipmaps();
@ -767,7 +767,7 @@ void Image::flip_y() {
} }
} }
if (gm) if (gm)
generate_mipmaps();; generate_mipmaps();
} }
@ -780,7 +780,7 @@ void Image::flip_x() {
bool gm=mipmaps; bool gm=mipmaps;
if (gm) if (gm)
clear_mipmaps();; clear_mipmaps();
for (int y=0;y<(height/2);y++) { for (int y=0;y<(height/2);y++) {
@ -795,7 +795,7 @@ void Image::flip_x() {
} }
if (gm) if (gm)
generate_mipmaps();; generate_mipmaps();
} }

6
core/input_map.cpp
View File

@ -198,7 +198,7 @@ Array InputMap::_get_action_list(const StringName& p_action) {
if (al) { if (al) {
for(const List<InputEvent>::Element *E=al->front();E;E=E->next()) { for(const List<InputEvent>::Element *E=al->front();E;E=E->next()) {
ret.push_back(E->get());; ret.push_back(E->get());
} }
} }
@ -234,7 +234,7 @@ bool InputMap::event_is_action(const InputEvent& p_event, const StringName& p_ac
void InputMap::load_from_globals() { void InputMap::load_from_globals() {
input_map.clear();; input_map.clear();
List<PropertyInfo> pinfo; List<PropertyInfo> pinfo;
Globals::get_singleton()->get_property_list(&pinfo); Globals::get_singleton()->get_property_list(&pinfo);
@ -249,7 +249,7 @@ void InputMap::load_from_globals() {
add_action(name); add_action(name);
Array va = Globals::get_singleton()->get(pi.name);; Array va = Globals::get_singleton()->get(pi.name);
for(int i=0;i<va.size();i++) { for(int i=0;i<va.size();i++) {

2
core/io/compression.cpp
View File

@ -59,7 +59,7 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,M
return -1; return -1;
strm.avail_in=p_src_size; strm.avail_in=p_src_size;
int aout = deflateBound(&strm,p_src_size);; int aout = deflateBound(&strm,p_src_size);
strm.avail_out=aout; strm.avail_out=aout;
strm.next_in=(Bytef*)p_src; strm.next_in=(Bytef*)p_src;
strm.next_out=p_dst; strm.next_out=p_dst;

2
core/map.h
View File

@ -428,7 +428,7 @@ private:
Element *aux=node->parent->left; Element *aux=node->parent->left;
if (aux->color==RED) { if (aux->color==RED) {
_set_color(aux,BLACK); _set_color(aux,BLACK);
_set_color(node->parent,RED);; _set_color(node->parent,RED);
_rotate_right(node->parent); _rotate_right(node->parent);
aux=node->parent->left; aux=node->parent->left;
} }

2
core/math/geometry.h
View File

@ -297,7 +297,7 @@ public:
if (inters_d<0 || inters_d>rel_l) if (inters_d<0 || inters_d>rel_l)
return false; return false;
Vector3 result=p_from+normal*inters_d;; Vector3 result=p_from+normal*inters_d;
if (r_res) if (r_res)
*r_res=result; *r_res=result;

2
core/os/mutex.cpp
View File

@ -47,7 +47,7 @@ Mutex::~Mutex() {
} }
Mutex *_global_mutex=NULL;; Mutex *_global_mutex=NULL;
void _global_lock() { void _global_lock() {

2
core/path_db.cpp
View File

@ -334,7 +334,7 @@ NodePath::NodePath(const String& p_path) {
StringName property; StringName property;
Vector<StringName> subpath; Vector<StringName> subpath;
int absolute=(path[0]=='/')?1:0;; int absolute=(path[0]=='/')?1:0;
bool last_is_slash=true; bool last_is_slash=true;
int slices=0; int slices=0;
int subpath_pos=path.find(":"); int subpath_pos=path.find(":");

2
core/resource.cpp
View File

@ -182,7 +182,7 @@ void Resource::set_path(const String& p_path, bool p_take_over) {
if (path_cache!="") { if (path_cache!="") {
ResourceCache::resources[path_cache]=this;; ResourceCache::resources[path_cache]=this;
} }
_change_notify("resource/path"); _change_notify("resource/path");

2
core/script_debugger_local.cpp
View File

@ -286,7 +286,7 @@ void ScriptDebuggerLocal::profiling_end() {
for(int i=0;i<ofs;i++) { for(int i=0;i<ofs;i++) {
print_line(itos(i)+":"+pinfo[i].signature); print_line(itos(i)+":"+pinfo[i].signature);
float tt=USEC_TO_SEC(pinfo[i].total_time);; float tt=USEC_TO_SEC(pinfo[i].total_time);
float st=USEC_TO_SEC(pinfo[i].self_time); float st=USEC_TO_SEC(pinfo[i].self_time);
print_line("\ttotal_ms: "+rtos(tt)+"\tself_ms: "+rtos(st)+"total%: "+itos(tt*100/total_time)+"\tself%: "+itos(st*100/total_time)+"\tcalls: "+itos(pinfo[i].call_count)); print_line("\ttotal_ms: "+rtos(tt)+"\tself_ms: "+rtos(st)+"total%: "+itos(tt*100/total_time)+"\tself%: "+itos(st*100/total_time)+"\tcalls: "+itos(pinfo[i].call_count));
} }

2
core/set.h
View File

@ -416,7 +416,7 @@ private:
Element *aux=node->parent->left; Element *aux=node->parent->left;
if (aux->color==RED) { if (aux->color==RED) {
_set_color(aux,BLACK); _set_color(aux,BLACK);
_set_color(node->parent,RED);; _set_color(node->parent,RED);
_rotate_right(node->parent); _rotate_right(node->parent);
aux=node->parent->left; aux=node->parent->left;
} }

4
core/ustring.cpp
View File

@ -1253,7 +1253,7 @@ _FORCE_INLINE static int parse_utf8_char(const char *p_utf8,unsigned int *p_ucs4
unichar=*p_utf8; unichar=*p_utf8;
else { else {
unichar=(0xFF >> (len +1)) & *p_utf8;; unichar=(0xFF >> (len +1)) & *p_utf8;
for (int i=1;i<len;i++) { for (int i=1;i<len;i++) {
@ -1402,7 +1402,7 @@ bool String::parse_utf8(const char* p_utf8,int p_len) {
unichar=*p_utf8; unichar=*p_utf8;
else { else {
unichar=(0xFF >> (len +1)) & *p_utf8;; unichar=(0xFF >> (len +1)) & *p_utf8;
for (int i=1;i<len;i++) { for (int i=1;i<len;i++) {

2
core/variant.cpp
View File

@ -1764,7 +1764,7 @@ Variant::operator Transform() const {
if (type==MATRIX32) { if (type==MATRIX32) {
return *_data._matrix32; return *_data._matrix32;
} else if (type==TRANSFORM) { } else if (type==TRANSFORM) {
const Transform& t = *_data._transform;; const Transform& t = *_data._transform;
Matrix32 m; Matrix32 m;
m.elements[0][0]=t.basis.elements[0][0]; m.elements[0][0]=t.basis.elements[0][0];
m.elements[0][1]=t.basis.elements[1][0]; m.elements[0][1]=t.basis.elements[1][0];

22
core/variant_call.cpp
View File

@ -1060,20 +1060,20 @@ Variant Variant::construct(const Variant::Type p_type, const Variant** p_args, i
// misc types // misc types
case COLOR: return Color(); case COLOR: return Color();
case IMAGE: return Image();; case IMAGE: return Image();
case NODE_PATH: return NodePath();; // 15 case NODE_PATH: return NodePath();; // 15
case _RID: return RID();; case _RID: return RID();
case OBJECT: return (Object*)NULL; case OBJECT: return (Object*)NULL;
case INPUT_EVENT: return InputEvent();; case INPUT_EVENT: return InputEvent();
case DICTIONARY: return Dictionary();; case DICTIONARY: return Dictionary();
case ARRAY: return Array();; // 20 case ARRAY: return Array();; // 20
case RAW_ARRAY: return ByteArray();; case RAW_ARRAY: return ByteArray();
case INT_ARRAY: return IntArray();; case INT_ARRAY: return IntArray();
case REAL_ARRAY: return RealArray();; case REAL_ARRAY: return RealArray();
case STRING_ARRAY: return StringArray();; case STRING_ARRAY: return StringArray();
case VECTOR2_ARRAY: return Vector2Array();; // 25 case VECTOR2_ARRAY: return Vector2Array(); // 25
case VECTOR3_ARRAY: return Vector3Array();; // 25 case VECTOR3_ARRAY: return Vector3Array(); // 25
case COLOR_ARRAY: return ColorArray();; case COLOR_ARRAY: return ColorArray();
default: return Variant(); default: return Variant();
} }

16
core/variant_parser.cpp
View File

@ -2014,7 +2014,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<uint8_t> data = img.get_data(); DVector<uint8_t> data = img.get_data();
int len = data.size(); int len = data.size();
DVector<uint8_t>::Read r = data.read(); DVector<uint8_t>::Read r = data.read();
const uint8_t *ptr=r.ptr();; const uint8_t *ptr=r.ptr();
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {
if (i>0) if (i>0)
@ -2156,7 +2156,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<uint8_t> data = p_variant; DVector<uint8_t> data = p_variant;
int len = data.size(); int len = data.size();
DVector<uint8_t>::Read r = data.read(); DVector<uint8_t>::Read r = data.read();
const uint8_t *ptr=r.ptr();; const uint8_t *ptr=r.ptr();
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {
if (i>0) if (i>0)
@ -2175,7 +2175,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<int> data = p_variant; DVector<int> data = p_variant;
int len = data.size(); int len = data.size();
DVector<int>::Read r = data.read(); DVector<int>::Read r = data.read();
const int *ptr=r.ptr();; const int *ptr=r.ptr();
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {
@ -2195,7 +2195,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<real_t> data = p_variant; DVector<real_t> data = p_variant;
int len = data.size(); int len = data.size();
DVector<real_t>::Read r = data.read(); DVector<real_t>::Read r = data.read();
const real_t *ptr=r.ptr();; const real_t *ptr=r.ptr();
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {
@ -2213,7 +2213,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<String> data = p_variant; DVector<String> data = p_variant;
int len = data.size(); int len = data.size();
DVector<String>::Read r = data.read(); DVector<String>::Read r = data.read();
const String *ptr=r.ptr();; const String *ptr=r.ptr();
String s; String s;
//write_string("\n"); //write_string("\n");
@ -2236,7 +2236,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<Vector2> data = p_variant; DVector<Vector2> data = p_variant;
int len = data.size(); int len = data.size();
DVector<Vector2>::Read r = data.read(); DVector<Vector2>::Read r = data.read();
const Vector2 *ptr=r.ptr();; const Vector2 *ptr=r.ptr();
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {
@ -2254,7 +2254,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<Vector3> data = p_variant; DVector<Vector3> data = p_variant;
int len = data.size(); int len = data.size();
DVector<Vector3>::Read r = data.read(); DVector<Vector3>::Read r = data.read();
const Vector3 *ptr=r.ptr();; const Vector3 *ptr=r.ptr();
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {
@ -2273,7 +2273,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str
DVector<Color> data = p_variant; DVector<Color> data = p_variant;
int len = data.size(); int len = data.size();
DVector<Color>::Read r = data.read(); DVector<Color>::Read r = data.read();
const Color *ptr=r.ptr();; const Color *ptr=r.ptr();
for (int i=0;i<len;i++) { for (int i=0;i<len;i++) {

2
drivers/convex_decomp/b2Polygon.cpp
View File

@ -353,7 +353,7 @@ bool b2Polygon::IsUsable(bool printErrors){
b2Vec2 centroid = PolyCentroid(vertices,nVertices); b2Vec2 centroid = PolyCentroid(vertices,nVertices);
b2Vec2 n1 = normals[iminus]; b2Vec2 n1 = normals[iminus];
b2Vec2 n2 = normals[i]; b2Vec2 n2 = normals[i];
b2Vec2 v = vertices[i] - centroid;; b2Vec2 v = vertices[i] - centroid;
b2Vec2 d; b2Vec2 d;
d.x = b2Dot(n1, v) - toiSlop; d.x = b2Dot(n1, v) - toiSlop;

4
drivers/gles2/rasterizer_gles2.cpp
View File

@ -3259,7 +3259,7 @@ void RasterizerGLES2::particles_set_emitting(RID p_particles, bool p_emitting) {
Particles* particles = particles_owner.get( p_particles ); Particles* particles = particles_owner.get( p_particles );
ERR_FAIL_COND(!particles); ERR_FAIL_COND(!particles);
particles->data.emitting=p_emitting;; particles->data.emitting=p_emitting;
} }
bool RasterizerGLES2::particles_is_emitting(RID p_particles) const { bool RasterizerGLES2::particles_is_emitting(RID p_particles) const {
@ -3468,7 +3468,7 @@ void RasterizerGLES2::particles_set_attractor_pos(RID p_particles, int p_attract
Particles* particles = particles_owner.get( p_particles ); Particles* particles = particles_owner.get( p_particles );
ERR_FAIL_COND(!particles); ERR_FAIL_COND(!particles);
ERR_FAIL_INDEX(p_attractor,particles->data.attractor_count); ERR_FAIL_INDEX(p_attractor,particles->data.attractor_count);
particles->data.attractors[p_attractor].pos=p_pos;; particles->data.attractors[p_attractor].pos=p_pos;
} }
Vector3 RasterizerGLES2::particles_get_attractor_pos(RID p_particles,int p_attractor) const { Vector3 RasterizerGLES2::particles_get_attractor_pos(RID p_particles,int p_attractor) const {

2
drivers/gles2/rasterizer_gles2.h
View File

@ -1429,7 +1429,7 @@ public:
virtual void multimesh_instance_set_color(RID p_multimesh,int p_index,const Color& p_color); virtual void multimesh_instance_set_color(RID p_multimesh,int p_index,const Color& p_color);
virtual RID multimesh_get_mesh(RID p_multimesh) const; virtual RID multimesh_get_mesh(RID p_multimesh) const;
virtual AABB multimesh_get_aabb(RID p_multimesh) const;; virtual AABB multimesh_get_aabb(RID p_multimesh) const;
virtual Transform multimesh_instance_get_transform(RID p_multimesh,int p_index) const; virtual Transform multimesh_instance_get_transform(RID p_multimesh,int p_index) const;
virtual Color multimesh_instance_get_color(RID p_multimesh,int p_index) const; virtual Color multimesh_instance_get_color(RID p_multimesh,int p_index) const;

2
drivers/rtaudio/audio_driver_rtaudio.cpp
View File

@ -71,7 +71,7 @@ int AudioDriverRtAudio::callback( void *outputBuffer, void *inputBuffer, unsigne
self->audio_server_process(nBufferFrames,buffer); self->audio_server_process(nBufferFrames,buffer);
self->mutex->unlock();; self->mutex->unlock();
return 0; return 0;
} }

2
drivers/windows/file_access_windows.cpp
View File

@ -50,7 +50,7 @@ void FileAccessWindows::check_errors() const {
if (feof(f)) { if (feof(f)) {
last_error=ERR_FILE_EOF;; last_error=ERR_FILE_EOF;
} }
} }

2
main/main.cpp
View File

@ -1325,7 +1325,7 @@ bool Main::start() {
DirAccess *da = DirAccess::open(local_game_path.substr(0,sep)); DirAccess *da = DirAccess::open(local_game_path.substr(0,sep));
if (da) { if (da) {
local_game_path=da->get_current_dir()+"/"+local_game_path.substr(sep+1,local_game_path.length());; local_game_path=da->get_current_dir()+"/"+local_game_path.substr(sep+1,local_game_path.length());
memdelete(da); memdelete(da);
} }
} }

6
main/performance.cpp
View File

@ -141,9 +141,9 @@ float Performance::get_monitor(Monitor p_monitor) const {
}; };
case RENDER_OBJECTS_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_OBJECTS_IN_FRAME); case RENDER_OBJECTS_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_OBJECTS_IN_FRAME);
case RENDER_VERTICES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_VERTICES_IN_FRAME); case RENDER_VERTICES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_VERTICES_IN_FRAME);
case RENDER_MATERIAL_CHANGES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_MATERIAL_CHANGES_IN_FRAME);; case RENDER_MATERIAL_CHANGES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_MATERIAL_CHANGES_IN_FRAME);
case RENDER_SHADER_CHANGES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_SHADER_CHANGES_IN_FRAME);; case RENDER_SHADER_CHANGES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_SHADER_CHANGES_IN_FRAME);
case RENDER_SURFACE_CHANGES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_SURFACE_CHANGES_IN_FRAME);; case RENDER_SURFACE_CHANGES_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_SURFACE_CHANGES_IN_FRAME);
case RENDER_DRAW_CALLS_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_DRAW_CALLS_IN_FRAME); case RENDER_DRAW_CALLS_IN_FRAME: return VS::get_singleton()->get_render_info(VS::INFO_DRAW_CALLS_IN_FRAME);
case RENDER_VIDEO_MEM_USED: return VS::get_singleton()->get_render_info(VS::INFO_VIDEO_MEM_USED); case RENDER_VIDEO_MEM_USED: return VS::get_singleton()->get_render_info(VS::INFO_VIDEO_MEM_USED);
case RENDER_TEXTURE_MEM_USED: return VS::get_singleton()->get_render_info(VS::INFO_TEXTURE_MEM_USED); case RENDER_TEXTURE_MEM_USED: return VS::get_singleton()->get_render_info(VS::INFO_TEXTURE_MEM_USED);

4
main/tests/test_gdscript.cpp
View File

@ -219,7 +219,7 @@ static String _parser_expr(const GDParser::Node *p_expr) {
case GDParser::OperatorNode::OP_ASSIGN_BIT_AND: { txt=_parser_expr(c_node->arguments[0])+"&="+_parser_expr(c_node->arguments[1]); } break; case GDParser::OperatorNode::OP_ASSIGN_BIT_AND: { txt=_parser_expr(c_node->arguments[0])+"&="+_parser_expr(c_node->arguments[1]); } break;
case GDParser::OperatorNode::OP_ASSIGN_BIT_OR: { txt=_parser_expr(c_node->arguments[0])+"|="+_parser_expr(c_node->arguments[1]); } break; case GDParser::OperatorNode::OP_ASSIGN_BIT_OR: { txt=_parser_expr(c_node->arguments[0])+"|="+_parser_expr(c_node->arguments[1]); } break;
case GDParser::OperatorNode::OP_ASSIGN_BIT_XOR: { txt=_parser_expr(c_node->arguments[0])+"^="+_parser_expr(c_node->arguments[1]); } break; case GDParser::OperatorNode::OP_ASSIGN_BIT_XOR: { txt=_parser_expr(c_node->arguments[0])+"^="+_parser_expr(c_node->arguments[1]); } break;
case GDParser::OperatorNode::OP_BIT_AND: { txt=_parser_expr(c_node->arguments[0])+"&"+_parser_expr(c_node->arguments[1]); } break;; case GDParser::OperatorNode::OP_BIT_AND: { txt=_parser_expr(c_node->arguments[0])+"&"+_parser_expr(c_node->arguments[1]); } break;
case GDParser::OperatorNode::OP_BIT_OR: { txt=_parser_expr(c_node->arguments[0])+"|"+_parser_expr(c_node->arguments[1]); } break; case GDParser::OperatorNode::OP_BIT_OR: { txt=_parser_expr(c_node->arguments[0])+"|"+_parser_expr(c_node->arguments[1]); } break;
case GDParser::OperatorNode::OP_BIT_XOR: { txt=_parser_expr(c_node->arguments[0])+"^"+_parser_expr(c_node->arguments[1]); } break; case GDParser::OperatorNode::OP_BIT_XOR: { txt=_parser_expr(c_node->arguments[0])+"^"+_parser_expr(c_node->arguments[1]); } break;
@ -924,7 +924,7 @@ MainLoop* test(TestType p_test) {
if (tk.get_token_line()!=line) { if (tk.get_token_line()!=line) {
int from=line+1; int from=line+1;
line = tk.get_token_line();; line = tk.get_token_line();
for(int i=from;i<=line;i++) { for(int i=from;i<=line;i++) {
int l=i-1; int l=i-1;

4
main/tests/test_gui.cpp
View File

@ -353,14 +353,14 @@ public:
label = memnew( Label ); label = memnew( Label );
label->set_text("Some Label"); label->set_text("Some Label");
label->set_pos( Point2(20,20) ); label->set_pos( Point2(20,20) );
ctl->add_child(label);; ctl->add_child(label);
ctl= memnew( Control ); ctl= memnew( Control );
ctl->set_name("tab 3"); ctl->set_name("tab 3");
button = memnew( Button ); button = memnew( Button );
button->set_text("Some Button"); button->set_text("Some Button");
button->set_pos( Point2(30,50) ); button->set_pos( Point2(30,50) );
ctl->add_child(button);; ctl->add_child(button);
tabc->add_child(ctl); tabc->add_child(ctl);

2
main/tests/test_physics.cpp
View File

@ -111,7 +111,7 @@ protected:
PhysicsServer * ps = PhysicsServer::get_singleton(); PhysicsServer * ps = PhysicsServer::get_singleton();
RID plane_shape = ps->shape_create(PhysicsServer::SHAPE_PLANE);; RID plane_shape = ps->shape_create(PhysicsServer::SHAPE_PLANE);
ps->shape_set_data( plane_shape, p_plane ); ps->shape_set_data( plane_shape, p_plane );
RID b = ps->body_create( PhysicsServer::BODY_MODE_STATIC ); RID b = ps->body_create( PhysicsServer::BODY_MODE_STATIC );

2
modules/gdscript/gd_compiler.cpp
View File

@ -1421,7 +1421,7 @@ Error GDCompiler::_parse_function(GDScript *p_script,const GDParser::ClassNode *
//funciton and class //funciton and class
if (p_class->name) { if (p_class->name) {
signature+="::"+String(p_class->name)+"."+String(func_name);; signature+="::"+String(p_class->name)+"."+String(func_name);
} else { } else {
signature+="::"+String(func_name); signature+="::"+String(func_name);
} }

2
modules/gdscript/gd_functions.cpp
View File

@ -544,7 +544,7 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va
String str; String str;
for(int i=0;i<p_arg_count;i++) { for(int i=0;i<p_arg_count;i++) {
String os = p_args[i]->operator String();; String os = p_args[i]->operator String();
if (i==0) if (i==0)
str=os; str=os;

2
modules/gdscript/gd_script.cpp
View File

@ -425,7 +425,7 @@ bool GDScript::_update_exports() {
} }
} }
members_cache.clear();; members_cache.clear();
member_default_values_cache.clear(); member_default_values_cache.clear();
for(int i=0;i<c->variables.size();i++) { for(int i=0;i<c->variables.size();i++) {

8
modules/gridmap/grid_map.cpp
View File

@ -65,7 +65,7 @@ bool GridMap::_set(const StringName& p_name, const Variant& p_value) {
int amount=cells.size(); int amount=cells.size();
DVector<int>::Read r = cells.read(); DVector<int>::Read r = cells.read();
ERR_FAIL_COND_V(amount&1,false); // not even ERR_FAIL_COND_V(amount&1,false); // not even
cell_map.clear();; cell_map.clear();
for(int i=0;i<amount/3;i++) { for(int i=0;i<amount/3;i++) {
@ -90,7 +90,7 @@ bool GridMap::_set(const StringName& p_name, const Variant& p_value) {
int amount=cells.size(); int amount=cells.size();
DVector<int>::Read r = cells.read(); DVector<int>::Read r = cells.read();
ERR_FAIL_COND_V(amount%3,false); // not even ERR_FAIL_COND_V(amount%3,false); // not even
cell_map.clear();; cell_map.clear();
for(int i=0;i<amount/3;i++) { for(int i=0;i<amount/3;i++) {
IndexKey ik; IndexKey ik;
@ -123,7 +123,7 @@ bool GridMap::_set(const StringName& p_name, const Variant& p_value) {
Octant &g = *octant_map[ok]; Octant &g = *octant_map[ok];
g.baked=b; g.baked=b;
g.bake_instance=VS::get_singleton()->instance_create();; g.bake_instance=VS::get_singleton()->instance_create();
VS::get_singleton()->instance_set_base(g.bake_instance,g.baked->get_rid()); VS::get_singleton()->instance_set_base(g.bake_instance,g.baked->get_rid());
VS::get_singleton()->instance_geometry_set_baked_light(g.bake_instance,baked_light_instance?baked_light_instance->get_baked_light_instance():RID()); VS::get_singleton()->instance_geometry_set_baked_light(g.bake_instance,baked_light_instance?baked_light_instance->get_baked_light_instance():RID());
} }
@ -908,7 +908,7 @@ void GridMap::_octant_bake(const OctantKey &p_key, const Ref<TriangleMesh>& p_tm
if (V) if (V)
V=V->next(); V=V->next();
else else
V=st->get_vertex_array().front();; V=st->get_vertex_array().front();
int lc = p_lights.size(); int lc = p_lights.size();
const BakeLight* bl = p_lights.ptr(); const BakeLight* bl = p_lights.ptr();
float ofs = cell_size*0.02; float ofs = cell_size*0.02;

6
modules/gridmap/grid_map_editor_plugin.cpp
View File

@ -903,7 +903,7 @@ void GridMapEditor::edit(GridMap *p_gridmap) {
Vector3 axis; Vector3 axis;
axis[i]=1; axis[i]=1;
Vector3 axis_n1; Vector3 axis_n1;
axis_n1[(i+1)%3]=cell_size[(i+1)%3];; axis_n1[(i+1)%3]=cell_size[(i+1)%3];
Vector3 axis_n2; Vector3 axis_n2;
axis_n2[(i+2)%3]=cell_size[(i+2)%3]; axis_n2[(i+2)%3]=cell_size[(i+2)%3];
@ -1275,8 +1275,8 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
edit_mode = memnew(OptionButton); edit_mode = memnew(OptionButton);
edit_mode->set_area_as_parent_rect(); edit_mode->set_area_as_parent_rect();
edit_mode->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,24);; edit_mode->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,24);
edit_mode->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,14);; edit_mode->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,14);
edit_mode->add_item("Tiles"); edit_mode->add_item("Tiles");
edit_mode->add_item("Areas"); edit_mode->add_item("Areas");
hb->add_child(edit_mode); hb->add_child(edit_mode);

6
modules/squish/image_compress_squish.cpp
View File

@ -54,12 +54,12 @@ void image_compress_squish(Image *p_image) {
if (p_image->get_format()==Image::FORMAT_GRAYSCALE_ALPHA) { if (p_image->get_format()==Image::FORMAT_GRAYSCALE_ALPHA) {
//compressed normalmap //compressed normalmap
target_format = Image::FORMAT_BC3; squish_comp|=squish::kDxt5;; target_format = Image::FORMAT_BC3; squish_comp|=squish::kDxt5;
} else if (p_image->detect_alpha()!=Image::ALPHA_NONE) { } else if (p_image->detect_alpha()!=Image::ALPHA_NONE) {
target_format = Image::FORMAT_BC2; squish_comp|=squish::kDxt3;; target_format = Image::FORMAT_BC2; squish_comp|=squish::kDxt3;
} else { } else {
target_format = Image::FORMAT_BC1; shift=1; squish_comp|=squish::kDxt1;; target_format = Image::FORMAT_BC1; shift=1; squish_comp|=squish::kDxt1;
} }
p_image->convert(Image::FORMAT_RGBA); //always expects rgba p_image->convert(Image::FORMAT_RGBA); //always expects rgba

2
platform/android/dir_access_android.cpp
View File

@ -192,6 +192,6 @@ DirAccessAndroid::DirAccessAndroid() {
DirAccessAndroid::~DirAccessAndroid() { DirAccessAndroid::~DirAccessAndroid() {
list_dir_end();; list_dir_end();
} }
#endif #endif

2
platform/bb10/bbutil.c
View File

@ -426,7 +426,7 @@ get_window_group_id()
int bbutil_rotate_screen_surface(int angle) { int bbutil_rotate_screen_surface(int angle) {
int rc, rotation, skip = 1, temp;; int rc, rotation, skip = 1, temp;
EGLint interval = 1; EGLint interval = 1;
int size[2]; int size[2];

4
platform/iphone/rasterizer_iphone.h
View File

@ -688,7 +688,7 @@ public:
virtual void multimesh_instance_set_color(RID p_multimesh,int p_index,const Color& p_color); virtual void multimesh_instance_set_color(RID p_multimesh,int p_index,const Color& p_color);
virtual RID multimesh_get_mesh(RID p_multimesh) const; virtual RID multimesh_get_mesh(RID p_multimesh) const;
virtual AABB multimesh_get_aabb(RID p_multimesh) const;; virtual AABB multimesh_get_aabb(RID p_multimesh) const;
virtual Transform multimesh_instance_get_transform(RID p_multimesh,int p_index) const; virtual Transform multimesh_instance_get_transform(RID p_multimesh,int p_index) const;
virtual Color multimesh_instance_get_color(RID p_multimesh,int p_index) const; virtual Color multimesh_instance_get_color(RID p_multimesh,int p_index) const;
@ -846,7 +846,7 @@ public:
virtual void canvas_begin(); virtual void canvas_begin();
virtual void canvas_set_transparency(float p_transparency); virtual void canvas_set_transparency(float p_transparency);
virtual void canvas_set_rect(const Rect2& p_rect, bool p_clip);; virtual void canvas_set_rect(const Rect2& p_rect, bool p_clip);
virtual void canvas_draw_line(const Point2& p_from, const Point2& p_to,const Color& p_color,float p_width); virtual void canvas_draw_line(const Point2& p_from, const Point2& p_to,const Color& p_color,float p_width);
virtual void canvas_draw_rect(const Rect2& p_rect, bool p_region, const Rect2& p_source,bool p_tile,RID p_texture,const Color& p_modulate); virtual void canvas_draw_rect(const Rect2& p_rect, bool p_region, const Rect2& p_source,bool p_tile,RID p_texture,const Color& p_modulate);
virtual void canvas_draw_style_box(const Rect2& p_rect, RID p_texture,const float *p_margins, bool p_draw_center=true); virtual void canvas_draw_style_box(const Rect2& p_rect, RID p_texture,const float *p_margins, bool p_draw_center=true);

2
platform/javascript/os_javascript.cpp
View File

@ -237,7 +237,7 @@ void OS_JavaScript::initialize(const VideoMode& p_desired,int p_video_driver,int
AudioDriverManagerSW::add_driver(&audio_driver_javascript); AudioDriverManagerSW::add_driver(&audio_driver_javascript);
if (true) { if (true) {
RasterizerGLES2 *rasterizer_gles22=memnew( RasterizerGLES2(false,false,false,false) );; RasterizerGLES2 *rasterizer_gles22=memnew( RasterizerGLES2(false,false,false,false) );
rasterizer_gles22->set_use_framebuffers(false); //not supported by emscripten rasterizer_gles22->set_use_framebuffers(false); //not supported by emscripten
if (gl_extensions) if (gl_extensions)
rasterizer_gles22->set_extensions(gl_extensions); rasterizer_gles22->set_extensions(gl_extensions);

2
scene/2d/area_2d.cpp
View File

@ -682,7 +682,7 @@ void Area2D::_bind_methods() {
Area2D::Area2D() : CollisionObject2D(Physics2DServer::get_singleton()->area_create(),true) { Area2D::Area2D() : CollisionObject2D(Physics2DServer::get_singleton()->area_create(),true) {
space_override=SPACE_OVERRIDE_DISABLED; space_override=SPACE_OVERRIDE_DISABLED;
set_gravity(98);; set_gravity(98);
set_gravity_vector(Vector2(0,1)); set_gravity_vector(Vector2(0,1));
gravity_is_point=false; gravity_is_point=false;
gravity_distance_scale=0; gravity_distance_scale=0;

4
scene/2d/navigation2d.cpp
View File

@ -127,7 +127,7 @@ void Navigation2D::_navpoly_link(int p_id) {
C->get().B=&p; C->get().B=&p;
C->get().B_edge=j; C->get().B_edge=j;
C->get().A->edges[C->get().A_edge].C=&p; C->get().A->edges[C->get().A_edge].C=&p;
C->get().A->edges[C->get().A_edge].C_edge=j;; C->get().A->edges[C->get().A_edge].C_edge=j;
p.edges[j].C=C->get().A; p.edges[j].C=C->get().A;
p.edges[j].C_edge=C->get().A_edge; p.edges[j].C_edge=C->get().A_edge;
//connection successful. //connection successful.
@ -679,7 +679,7 @@ debug path
path.push_back(begin_point); path.push_back(begin_point);
path.invert();; path.invert();
} }
return path; return path;

2
scene/2d/navigation_polygon.cpp
View File

@ -137,7 +137,7 @@ DVector<Vector2> NavigationPolygon::get_outline(int p_idx) const {
void NavigationPolygon::clear_outlines(){ void NavigationPolygon::clear_outlines(){
outlines.clear();; outlines.clear();
} }
void NavigationPolygon::make_polygons_from_outlines(){ void NavigationPolygon::make_polygons_from_outlines(){

4
scene/2d/sprite.h
View File

@ -59,7 +59,7 @@ protected:
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods();; static void _bind_methods();
virtual void _validate_property(PropertyInfo& property) const; virtual void _validate_property(PropertyInfo& property) const;
@ -122,7 +122,7 @@ protected:
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods();; static void _bind_methods();
public: public:

2
scene/3d/area.cpp
View File

@ -663,7 +663,7 @@ void Area::_bind_methods() {
Area::Area() : CollisionObject(PhysicsServer::get_singleton()->area_create(),true) { Area::Area() : CollisionObject(PhysicsServer::get_singleton()->area_create(),true) {
space_override=SPACE_OVERRIDE_DISABLED; space_override=SPACE_OVERRIDE_DISABLED;
set_gravity(9.8);; set_gravity(9.8);
locked=false; locked=false;
set_gravity_vector(Vector3(0,-1,0)); set_gravity_vector(Vector3(0,-1,0));
gravity_is_point=false; gravity_is_point=false;

2
scene/3d/body_shape.cpp
View File

@ -506,7 +506,7 @@ void CollisionShape::_create_debug_shape() {
if (debug_shape) { if (debug_shape) {
debug_shape->queue_delete();; debug_shape->queue_delete();
debug_shape=NULL; debug_shape=NULL;
} }

4
scene/3d/bone_attachment.cpp
View File

@ -79,7 +79,7 @@ void BoneAttachment::_check_bind() {
Skeleton *sk = get_parent()->cast_to<Skeleton>(); Skeleton *sk = get_parent()->cast_to<Skeleton>();
int idx = sk->find_bone(bone_name); int idx = sk->find_bone(bone_name);
if (idx!=-1) { if (idx!=-1) {
sk->bind_child_node_to_bone(idx,this);; sk->bind_child_node_to_bone(idx,this);
set_transform(sk->get_bone_global_pose(idx)); set_transform(sk->get_bone_global_pose(idx));
bound=true; bound=true;
} }
@ -94,7 +94,7 @@ void BoneAttachment::_check_unbind() {
Skeleton *sk = get_parent()->cast_to<Skeleton>(); Skeleton *sk = get_parent()->cast_to<Skeleton>();
int idx = sk->find_bone(bone_name); int idx = sk->find_bone(bone_name);
if (idx!=-1) { if (idx!=-1) {
sk->unbind_child_node_from_bone(idx,this);; sk->unbind_child_node_from_bone(idx,this);
} }
} }
bound=false; bound=false;

2
scene/3d/camera.cpp
View File

@ -727,7 +727,7 @@ Vector<Plane> Camera::get_frustum() const {
void Camera::set_v_offset(float p_offset) { void Camera::set_v_offset(float p_offset) {
v_offset=p_offset; v_offset=p_offset;
_update_camera();; _update_camera();
} }
float Camera::get_v_offset() const { float Camera::get_v_offset() const {

2
scene/3d/character_camera.cpp
View File

@ -168,7 +168,7 @@ void CharacterCamera::_compute_camera() {
Vector3 vec1 = accepted.origin; Vector3 vec1 = accepted.origin;
Vector3 vec2 = proposed.origin; Vector3 vec2 = proposed.origin;
final.origin = vec2.linear_interpolate(vec1, pos_ratio * time);; final.origin = vec2.linear_interpolate(vec1, pos_ratio * time);
Quat q1 = accepted.basis; Quat q1 = accepted.basis;
Quat q2 = proposed.basis; Quat q2 = proposed.basis;

2
scene/3d/mesh_instance.cpp
View File

@ -91,7 +91,7 @@ void MeshInstance::_get_property_list( List<PropertyInfo> *p_list) const {
ls.push_back(E->key()); ls.push_back(E->key());
} }
ls.sort();; ls.sort();
for(List<String>::Element *E=ls.front();E;E=E->next()) { for(List<String>::Element *E=ls.front();E;E=E->next()) {
p_list->push_back( PropertyInfo(Variant::REAL,E->get(),PROPERTY_HINT_RANGE,"0,1,0.01")); p_list->push_back( PropertyInfo(Variant::REAL,E->get(),PROPERTY_HINT_RANGE,"0,1,0.01"));

4
scene/3d/navigation.cpp
View File

@ -129,7 +129,7 @@ void Navigation::_navmesh_link(int p_id) {
C->get().B=&p; C->get().B=&p;
C->get().B_edge=j; C->get().B_edge=j;
C->get().A->edges[C->get().A_edge].C=&p; C->get().A->edges[C->get().A_edge].C=&p;
C->get().A->edges[C->get().A_edge].C_edge=j;; C->get().A->edges[C->get().A_edge].C_edge=j;
p.edges[j].C=C->get().A; p.edges[j].C=C->get().A;
p.edges[j].C_edge=C->get().A_edge; p.edges[j].C_edge=C->get().A_edge;
//connection successful. //connection successful.
@ -550,7 +550,7 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3& p_start, const Vector
path.push_back(begin_point); path.push_back(begin_point);
path.invert();; path.invert();
} }
return path; return path;

4
scene/3d/sprite_3d.cpp
View File

@ -1187,7 +1187,7 @@ void AnimatedSprite3D::set_frame(int p_frame) {
frame=p_frame; frame=p_frame;
_reset_timeout(); _reset_timeout();
_queue_update();; _queue_update();
_change_notify("frame"); _change_notify("frame");
emit_signal(SceneStringNames::get_singleton()->frame_changed); emit_signal(SceneStringNames::get_singleton()->frame_changed);
@ -1290,7 +1290,7 @@ void AnimatedSprite3D::set_animation(const StringName& p_animation){
_reset_timeout(); _reset_timeout();
set_frame(0); set_frame(0);
_change_notify(); _change_notify();
_queue_update();; _queue_update();
} }
StringName AnimatedSprite3D::get_animation() const{ StringName AnimatedSprite3D::get_animation() const{

2
scene/animation/animation_cache.cpp
View File

@ -62,7 +62,7 @@ void AnimationCache::_clear_cache() {
connected_nodes.front()->get()->disconnect("exit_tree",this,"_node_exit_tree"); connected_nodes.front()->get()->disconnect("exit_tree",this,"_node_exit_tree");
connected_nodes.erase(connected_nodes.front()); connected_nodes.erase(connected_nodes.front());
} }
path_cache.clear();; path_cache.clear();
cache_valid=false; cache_valid=false;
cache_dirty=true; cache_dirty=true;
} }

2
scene/animation/animation_player.cpp
View File

@ -856,7 +856,7 @@ void AnimationPlayer::rename_animation(const StringName& p_name,const StringName
while(to_erase.size()) { while(to_erase.size()) {
blend_times.erase(to_erase.front()->get()); blend_times.erase(to_erase.front()->get());
to_erase.pop_front();; to_erase.pop_front();
} }
while(to_insert.size()) { while(to_insert.size()) {

2
scene/animation/animation_tree_player.cpp
View File

@ -1643,7 +1643,7 @@ void AnimationTreePlayer::_recompute_caches(const StringName& p_node) {
if (nb->type==NODE_ANIMATION) { if (nb->type==NODE_ANIMATION) {
AnimationNode *an = static_cast<AnimationNode*>(nb); AnimationNode *an = static_cast<AnimationNode*>(nb);
an->tref.clear();; an->tref.clear();
if (!an->animation.is_null()) { if (!an->animation.is_null()) {

2
scene/gui/box_container.cpp
View File

@ -42,7 +42,7 @@ void BoxContainer::_resort() {
/** First pass, determine minimum size AND amount of stretchable elements */ /** First pass, determine minimum size AND amount of stretchable elements */
Size2i new_size=get_size();; Size2i new_size=get_size();
int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer"); int sep=get_constant("separation");//,vertical?"VBoxContainer":"HBoxContainer");

2
scene/gui/control.cpp
View File

@ -1670,7 +1670,7 @@ Control *Control::find_next_valid_focus() const {
if (!next_child) { if (!next_child) {
next_child=const_cast<Control*>(this);; next_child=const_cast<Control*>(this);
while(next_child) { while(next_child) {
if (next_child->data.SI || next_child->data.RI) if (next_child->data.SI || next_child->data.RI)

4
scene/gui/item_list.cpp
View File

@ -300,7 +300,7 @@ void ItemList::move_item(int p_item,int p_to_pos) {
ERR_FAIL_INDEX(p_to_pos,items.size()+1); ERR_FAIL_INDEX(p_to_pos,items.size()+1);
Item it=items[p_item]; Item it=items[p_item];
items.remove(p_item);; items.remove(p_item);
if (p_to_pos>p_item) { if (p_to_pos>p_item) {
p_to_pos--; p_to_pos--;
@ -906,7 +906,7 @@ void ItemList::_notification(int p_what) {
Vector2 ofs; Vector2 ofs;
int col=0; int col=0;
int max_h=0; int max_h=0;
separators.clear();; separators.clear();
for(int i=0;i<items.size();i++) { for(int i=0;i<items.size();i++) {
if (current_columns>1 && items[i].rect_cache.size.width+ofs.x > fit_size) { if (current_columns>1 && items[i].rect_cache.size.width+ofs.x > fit_size) {

2
scene/gui/label.cpp
View File

@ -196,7 +196,7 @@ void Label::_notification(int p_what) {
} break; } break;
case ALIGN_CENTER: { case ALIGN_CENTER: {
x_ofs=int(size.width-(taken+spaces*space_w))/2;; x_ofs=int(size.width-(taken+spaces*space_w))/2;
} break; } break;
case ALIGN_RIGHT: { case ALIGN_RIGHT: {

2
scene/gui/line_edit.cpp
View File

@ -1292,7 +1292,7 @@ void LineEdit::_bind_methods() {
ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "editable" ), _SCS("set_editable"),_SCS("is_editable") ); ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "editable" ), _SCS("set_editable"),_SCS("is_editable") );
ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "secret" ), _SCS("set_secret"),_SCS("is_secret") ); ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "secret" ), _SCS("set_secret"),_SCS("is_secret") );
ADD_PROPERTY( PropertyInfo( Variant::INT,"focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), _SCS("set_focus_mode"), _SCS("get_focus_mode") ); ADD_PROPERTY( PropertyInfo( Variant::INT,"focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), _SCS("set_focus_mode"), _SCS("get_focus_mode") );
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret/caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));; ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret/caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));
ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "caret/caret_blink_speed",PROPERTY_HINT_RANGE,"0.1,10,0.1"), _SCS("cursor_set_blink_speed"),_SCS("cursor_get_blink_speed") ); ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "caret/caret_blink_speed",PROPERTY_HINT_RANGE,"0.1,10,0.1"), _SCS("cursor_set_blink_speed"),_SCS("cursor_get_blink_speed") );
} }

2
scene/gui/rich_text_label.cpp
View File

@ -103,7 +103,7 @@ void RichTextLabel::_process_line(ItemFrame *p_frame,const Vector2& p_ofs,int &y
int line_ofs=0; int line_ofs=0;
int margin=_find_margin(it,p_base_font); int margin=_find_margin(it,p_base_font);
Align align=_find_align(it);; Align align=_find_align(it);
int line=0; int line=0;
int spaces=0; int spaces=0;

2
scene/gui/separator.h
View File

@ -45,7 +45,7 @@ protected:
void _notification(int p_what); void _notification(int p_what);
public: public:
virtual Size2 get_minimum_size() const;; virtual Size2 get_minimum_size() const;
Separator(); Separator();
~Separator(); ~Separator();

4
scene/gui/tab_container.cpp
View File

@ -40,7 +40,7 @@ int TabContainer::_get_top_margin() const {
int h = MAX( tab_bg->get_minimum_size().height,tab_fg->get_minimum_size().height); int h = MAX( tab_bg->get_minimum_size().height,tab_fg->get_minimum_size().height);
int ch = font->get_height();; int ch = font->get_height();
for(int i=0;i<get_child_count();i++) { for(int i=0;i<get_child_count();i++) {
Control *c = get_child(i)->cast_to<Control>(); Control *c = get_child(i)->cast_to<Control>();
@ -99,7 +99,7 @@ void TabContainer::_input_event(const InputEvent& p_event) {
pp_pos.y+=menu->get_height(); pp_pos.y+=menu->get_height();
popup->set_global_pos( pp_pos ); popup->set_global_pos( pp_pos );
popup->popup();; popup->popup();
return; return;
} }
pos.x-=tabs_ofs_cache; pos.x-=tabs_ofs_cache;

2
scene/gui/text_edit.cpp
View File

@ -246,7 +246,7 @@ void TextEdit::Text::clear_caches() {
void TextEdit::Text::clear() { void TextEdit::Text::clear() {
text.clear();; text.clear();
insert(0,""); insert(0,"");
} }

10
scene/gui/tree.cpp
View File

@ -596,7 +596,7 @@ void TreeItem::clear_custom_color(int p_column) {
ERR_FAIL_INDEX( p_column, cells.size() ); ERR_FAIL_INDEX( p_column, cells.size() );
cells[p_column].custom_color=false; cells[p_column].custom_color=false;
cells[p_column].color=Color();; cells[p_column].color=Color();
_changed_notify(p_column); _changed_notify(p_column);
} }
@ -627,7 +627,7 @@ void TreeItem::clear_custom_bg_color(int p_column) {
ERR_FAIL_INDEX( p_column, cells.size() ); ERR_FAIL_INDEX( p_column, cells.size() );
cells[p_column].custom_bg_color=false; cells[p_column].custom_bg_color=false;
cells[p_column].bg_color=Color();; cells[p_column].bg_color=Color();
_changed_notify(p_column); _changed_notify(p_column);
} }
@ -1230,7 +1230,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
icon_ofs+=item_rect.pos; icon_ofs+=item_rect.pos;
draw_texture_rect(p_item->cells[i].icon,Rect2(icon_ofs,icon_size));; draw_texture_rect(p_item->cells[i].icon,Rect2(icon_ofs,icon_size));
//p_item->cells[i].icon->draw(ci, icon_ofs); //p_item->cells[i].icon->draw(ci, icon_ofs);
} break; } break;
@ -2646,7 +2646,7 @@ void Tree::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) { if (p_what==NOTIFICATION_ENTER_TREE) {
update_cache();; update_cache();
} }
if (p_what==NOTIFICATION_DRAG_END) { if (p_what==NOTIFICATION_DRAG_END) {
@ -3303,7 +3303,7 @@ TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_co
if (root!=p_item || ! hide_root) { if (root!=p_item || ! hide_root) {
h = compute_item_height(p_item)+cache.vseparation;; h = compute_item_height(p_item)+cache.vseparation;
if (pos.y<h) { if (pos.y<h) {
if (drop_mode_flags==DROP_MODE_ON_ITEM) { if (drop_mode_flags==DROP_MODE_ON_ITEM) {

2
scene/main/node.cpp
View File

@ -894,7 +894,7 @@ Node *Node::_get_node(const NodePath& p_path) const {
current=const_cast<Node*>(this); //start from this current=const_cast<Node*>(this); //start from this
} else { } else {
root=const_cast<Node*>(this);; root=const_cast<Node*>(this);
while (root->data.parent) while (root->data.parent)
root=root->data.parent; //start from root root=root->data.parent; //start from root
} }

4
scene/main/viewport.cpp
View File

@ -1730,7 +1730,7 @@ Control* Viewport::_gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_g
if (!ci || ci->is_set_as_toplevel()) if (!ci || ci->is_set_as_toplevel())
continue; continue;
Control *ret=_gui_find_control_at_pos(ci,p_global,matrix,r_inv_xform);; Control *ret=_gui_find_control_at_pos(ci,p_global,matrix,r_inv_xform);
if (ret) if (ret)
return ret; return ret;
} }
@ -1957,7 +1957,7 @@ void Viewport::_gui_input_event(InputEvent p_event) {
// D&D // D&D
if (!gui.drag_attempted && gui.mouse_focus && p_event.mouse_motion.button_mask&BUTTON_MASK_LEFT) { if (!gui.drag_attempted && gui.mouse_focus && p_event.mouse_motion.button_mask&BUTTON_MASK_LEFT) {
gui.drag_accum+=Point2(p_event.mouse_motion.relative_x,p_event.mouse_motion.relative_y);; gui.drag_accum+=Point2(p_event.mouse_motion.relative_x,p_event.mouse_motion.relative_y);
float len = gui.drag_accum.length(); float len = gui.drag_accum.length();
if (len>10) { if (len>10) {
gui.drag_data=gui.mouse_focus->get_drag_data(gui.focus_inv_xform.xform(mpos)-gui.drag_accum); gui.drag_data=gui.mouse_focus->get_drag_data(gui.focus_inv_xform.xform(mpos)-gui.drag_accum);

2
scene/resources/dynamic_font.cpp
View File

@ -960,7 +960,7 @@ RES ResourceFormatLoaderDynamicFont::load(const String &p_path, const String& p_
*r_error=ERR_FILE_CANT_OPEN; *r_error=ERR_FILE_CANT_OPEN;
Ref<DynamicFontData> dfont; Ref<DynamicFontData> dfont;
dfont.instance();; dfont.instance();
dfont->set_font_path(p_path); dfont->set_font_path(p_path);

2
scene/resources/packed_scene.cpp
View File

@ -294,7 +294,7 @@ Node *SceneState::instance(bool p_gen_edit_state) const {
//remove nodes that could not be added, likely as a result that //remove nodes that could not be added, likely as a result that
while(stray_instances.size()) { while(stray_instances.size()) {
memdelete(stray_instances.front()->get()); memdelete(stray_instances.front()->get());
stray_instances.pop_front();; stray_instances.pop_front();
} }
for(int i=0;i<editable_instances.size();i++) { for(int i=0;i<editable_instances.size();i++) {

2
scene/resources/polygon_path_finder.cpp
View File

@ -419,7 +419,7 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2& p_from, const Vector
path.push_back(points[at].pos); path.push_back(points[at].pos);
} while (at!=aidx); } while (at!=aidx);
path.invert();; path.invert();
} }
for(int i=0;i<points.size()-2;i++) { for(int i=0;i<points.size()-2;i++) {

4
scene/resources/shader_graph.cpp
View File

@ -2159,7 +2159,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
case SCALAR_OP_ATAN2: optxt = "atan2("+p_inputs[0]+","+p_inputs[1]+");"; break; case SCALAR_OP_ATAN2: optxt = "atan2("+p_inputs[0]+","+p_inputs[1]+");"; break;
} }
code+=OUTNAME(p_node->id,0)+"="+optxt+"\n";; code+=OUTNAME(p_node->id,0)+"="+optxt+"\n";
}break; }break;
case NODE_VEC_OP: { case NODE_VEC_OP: {
@ -2362,7 +2362,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
code+="\t"+OUTVAR(p_node->id,0)+"=vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);\n"; code+="\t"+OUTVAR(p_node->id,0)+"=vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);\n";
code+="}\n"; code+="}\n";
} else if (func==VEC_FUNC_HSV2RGB) { } else if (func==VEC_FUNC_HSV2RGB) {
code += OUTNAME(p_node->id,0)+";\n";; code += OUTNAME(p_node->id,0)+";\n";
code+="{\n"; code+="{\n";
code+="\tvec3 c = "+p_inputs[0]+";\n"; code+="\tvec3 c = "+p_inputs[0]+";\n";
code+="\tvec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);\n"; code+="\tvec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);\n";

2
scene/resources/surface_tool.cpp
View File

@ -834,7 +834,7 @@ void SurfaceTool::clear() {
begun=false; begun=false;
primitive=Mesh::PRIMITIVE_LINES; primitive=Mesh::PRIMITIVE_LINES;
format=0; format=0;
last_bones.clear();; last_bones.clear();
last_weights.clear(); last_weights.clear();
index_array.clear(); index_array.clear();
vertex_array.clear(); vertex_array.clear();

28
scene/resources/theme.cpp
View File

@ -233,7 +233,7 @@ void Theme::set_default_theme_font( const Ref<Font>& p_default_font ) {
} }
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
@ -275,7 +275,7 @@ void Theme::set_icon(const StringName& p_name,const StringName& p_type,const Ref
if (new_value) { if (new_value) {
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
} }
Ref<Texture> Theme::get_icon(const StringName& p_name,const StringName& p_type) const { Ref<Texture> Theme::get_icon(const StringName& p_name,const StringName& p_type) const {
@ -301,7 +301,7 @@ void Theme::clear_icon(const StringName& p_name,const StringName& p_type) {
icon_map[p_type].erase(p_name); icon_map[p_type].erase(p_name);
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
@ -326,7 +326,7 @@ void Theme::set_shader(const StringName &p_name,const StringName &p_type,const R
if (new_value) { if (new_value) {
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
} }
@ -348,7 +348,7 @@ void Theme::clear_shader(const StringName &p_name, const StringName &p_type) {
shader_map[p_type].erase(p_name); shader_map[p_type].erase(p_name);
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
void Theme::get_shader_list(const StringName &p_type, List<StringName> *p_list) const { void Theme::get_shader_list(const StringName &p_type, List<StringName> *p_list) const {
@ -375,7 +375,7 @@ void Theme::set_stylebox(const StringName& p_name,const StringName& p_type,const
if (new_value) if (new_value)
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
@ -403,7 +403,7 @@ void Theme::clear_stylebox(const StringName& p_name,const StringName& p_type) {
style_map[p_type].erase(p_name); style_map[p_type].erase(p_name);
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
@ -447,7 +447,7 @@ void Theme::set_font(const StringName& p_name,const StringName& p_type,const Ref
if (new_value) { if (new_value) {
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
} }
Ref<Font> Theme::get_font(const StringName& p_name,const StringName& p_type) const { Ref<Font> Theme::get_font(const StringName& p_name,const StringName& p_type) const {
@ -477,7 +477,7 @@ void Theme::clear_font(const StringName& p_name,const StringName& p_type) {
font_map[p_type].erase(p_name); font_map[p_type].erase(p_name);
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
@ -503,7 +503,7 @@ void Theme::set_color(const StringName& p_name,const StringName& p_type,const Co
if (new_value) { if (new_value) {
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
} }
@ -531,7 +531,7 @@ void Theme::clear_color(const StringName& p_name,const StringName& p_type) {
color_map[p_type].erase(p_name); color_map[p_type].erase(p_name);
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
@ -556,7 +556,7 @@ void Theme::set_constant(const StringName& p_name,const StringName& p_type,int p
if (new_value) { if (new_value) {
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
} }
@ -582,7 +582,7 @@ void Theme::clear_constant(const StringName& p_name,const StringName& p_type) {
constant_map[p_type].erase(p_name); constant_map[p_type].erase(p_name);
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }
@ -611,7 +611,7 @@ void Theme::copy_default_theme() {
color_map=default_theme->color_map; color_map=default_theme->color_map;
constant_map=default_theme->constant_map; constant_map=default_theme->constant_map;
_change_notify(); _change_notify();
emit_changed();; emit_changed();
} }

2
servers/physics/collision_solver_sat.cpp
View File

@ -635,7 +635,7 @@ static void _collision_sphere_convex_polygon(const ShapeSW *p_a,const Transform
Vector3 n1=v2-v1; Vector3 n1=v2-v1;
Vector3 n2=v2-v3; Vector3 n2=v2-v3;
Vector3 axis = n1.cross(n2).cross(n1).normalized();; Vector3 axis = n1.cross(n2).cross(n1).normalized();
if (!separator.test_axis( axis )) if (!separator.test_axis( axis ))
return; return;

2
servers/physics/joints/hinge_joint_sw.cpp
View File

@ -371,7 +371,7 @@ void HingeJointSW::solve(float p_step) {
real_t desiredMotorVel = m_motorTargetVelocity; real_t desiredMotorVel = m_motorTargetVelocity;
real_t motor_relvel = desiredMotorVel - projRelVel; real_t motor_relvel = desiredMotorVel - projRelVel;
real_t unclippedMotorImpulse = m_kHinge * motor_relvel;; real_t unclippedMotorImpulse = m_kHinge * motor_relvel;
//todo: should clip against accumulated impulse //todo: should clip against accumulated impulse
real_t clippedMotorImpulse = unclippedMotorImpulse > m_maxMotorImpulse ? m_maxMotorImpulse : unclippedMotorImpulse; real_t clippedMotorImpulse = unclippedMotorImpulse > m_maxMotorImpulse ? m_maxMotorImpulse : unclippedMotorImpulse;
clippedMotorImpulse = clippedMotorImpulse < -m_maxMotorImpulse ? -m_maxMotorImpulse : clippedMotorImpulse; clippedMotorImpulse = clippedMotorImpulse < -m_maxMotorImpulse ? -m_maxMotorImpulse : clippedMotorImpulse;

2
servers/physics/shape_sw.cpp
View File

@ -1618,7 +1618,7 @@ void HeightMapShapeSW::_setup(DVector<real_t> p_heights,int p_width,int p_depth,
heights=p_heights; heights=p_heights;
width=p_width; width=p_width;
depth=p_depth;; depth=p_depth;
cell_size=p_cell_size; cell_size=p_cell_size;
DVector<real_t>::Read r = heights. read(); DVector<real_t>::Read r = heights. read();

4
servers/physics_2d/physics_2d_server_wrap_mt.cpp
View File

@ -95,7 +95,7 @@ void Physics2DServerWrapMT::sync() {
else else
step_sem->wait(); //must not wait if a step was not issued step_sem->wait(); //must not wait if a step was not issued
} }
physics_2d_server->sync();; physics_2d_server->sync();
} }
void Physics2DServerWrapMT::flush_queries(){ void Physics2DServerWrapMT::flush_queries(){
@ -105,7 +105,7 @@ void Physics2DServerWrapMT::flush_queries(){
void Physics2DServerWrapMT::end_sync() { void Physics2DServerWrapMT::end_sync() {
physics_2d_server->end_sync();; physics_2d_server->end_sync();
} }
void Physics2DServerWrapMT::init() { void Physics2DServerWrapMT::init() {

2
servers/physics_2d_server.cpp
View File

@ -179,7 +179,7 @@ int Physics2DShapeQueryParameters::get_object_type_mask() const{
} }
void Physics2DShapeQueryParameters::set_exclude(const Vector<RID>& p_exclude) { void Physics2DShapeQueryParameters::set_exclude(const Vector<RID>& p_exclude) {
exclude.clear();; exclude.clear();
for(int i=0;i<p_exclude.size();i++) for(int i=0;i<p_exclude.size();i++)
exclude.insert(p_exclude[i]); exclude.insert(p_exclude[i]);

2
servers/physics_server.cpp
View File

@ -174,7 +174,7 @@ int PhysicsShapeQueryParameters::get_object_type_mask() const{
} }
void PhysicsShapeQueryParameters::set_exclude(const Vector<RID>& p_exclude) { void PhysicsShapeQueryParameters::set_exclude(const Vector<RID>& p_exclude) {
exclude.clear();; exclude.clear();
for(int i=0;i<p_exclude.size();i++) for(int i=0;i<p_exclude.size();i++)
exclude.insert(p_exclude[i]); exclude.insert(p_exclude[i]);

2
servers/visual/rasterizer.h
View File

@ -311,7 +311,7 @@ public:
virtual void multimesh_instance_set_color(RID p_multimesh,int p_index,const Color& p_color)=0; virtual void multimesh_instance_set_color(RID p_multimesh,int p_index,const Color& p_color)=0;
virtual RID multimesh_get_mesh(RID p_multimesh) const=0; virtual RID multimesh_get_mesh(RID p_multimesh) const=0;
virtual AABB multimesh_get_aabb(RID p_multimesh) const=0;; virtual AABB multimesh_get_aabb(RID p_multimesh) const=0;
virtual Transform multimesh_instance_get_transform(RID p_multimesh,int p_index) const=0; virtual Transform multimesh_instance_get_transform(RID p_multimesh,int p_index) const=0;
virtual Color multimesh_instance_get_color(RID p_multimesh,int p_index) const=0; virtual Color multimesh_instance_get_color(RID p_multimesh,int p_index) const=0;

4
tools/collada/collada.cpp
View File

@ -1287,7 +1287,7 @@ void Collada::_parse_skin_controller(XMLParser& parser,String p_id) {
int stride=1; int stride=1;
if (parser.has_attribute("stride")) if (parser.has_attribute("stride"))
stride=parser.get_attribute_value("stride").to_int();; stride=parser.get_attribute_value("stride").to_int();
skindata.sources[current_source].stride=stride; skindata.sources[current_source].stride=stride;
COLLADA_PRINT("section: "+current_source+" stride "+itos(skindata.sources[current_source].stride)); COLLADA_PRINT("section: "+current_source+" stride "+itos(skindata.sources[current_source].stride));
@ -1457,7 +1457,7 @@ void Collada::_parse_morph_controller(XMLParser& parser, String p_id) {
int stride=1; int stride=1;
if (parser.has_attribute("stride")) if (parser.has_attribute("stride"))
stride=parser.get_attribute_value("stride").to_int();; stride=parser.get_attribute_value("stride").to_int();
morphdata.sources[current_source].stride=stride; morphdata.sources[current_source].stride=stride;
COLLADA_PRINT("section: "+current_source+" stride "+itos(morphdata.sources[current_source].stride)); COLLADA_PRINT("section: "+current_source+" stride "+itos(morphdata.sources[current_source].stride));

8
tools/editor/animation_editor.cpp
View File

@ -518,7 +518,7 @@ public:
case Animation::TYPE_VALUE: { case Animation::TYPE_VALUE: {
if (name=="value") { if (name=="value") {
r_ret = animation->track_get_key_value(track,key);; r_ret = animation->track_get_key_value(track,key);
return true; return true;
} }
@ -1877,7 +1877,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) {
else else
_menu_track(TRACK_MENU_DUPLICATE); _menu_track(TRACK_MENU_DUPLICATE);
accept_event();; accept_event();
} else if (p_input.key.scancode==KEY_DELETE && p_input.key.pressed && click.click==ClickOver::CLICK_NONE) { } else if (p_input.key.scancode==KEY_DELETE && p_input.key.pressed && click.click==ClickOver::CLICK_NONE) {
@ -2850,7 +2850,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) {
} break; } break;
case Animation::TYPE_VALUE: { case Animation::TYPE_VALUE: {
Variant v = animation->track_get_key_value(idx,mouse_over.over_key);; Variant v = animation->track_get_key_value(idx,mouse_over.over_key);
//text+="value: "+String(v)+"\n"; //text+="value: "+String(v)+"\n";
bool prop_exists=false; bool prop_exists=false;
@ -3626,7 +3626,7 @@ void AnimationKeyEditor::_pane_drag(const Point2& p_delta) {
ecs.y-=p_delta.y; ecs.y-=p_delta.y;
if (ecs.y<100) if (ecs.y<100)
ecs.y=100; ecs.y=100;
ec->set_custom_minimum_size(ecs);; ec->set_custom_minimum_size(ecs);
} }

2
tools/editor/asset_library_editor_plugin.cpp
View File

@ -789,7 +789,7 @@ void EditorAssetLibrary::_image_request_completed(int p_status, int p_code, cons
} }
} }
image_queue[p_queue_id].request->queue_delete();; image_queue[p_queue_id].request->queue_delete();
image_queue.erase(p_queue_id); image_queue.erase(p_queue_id);
_update_image_queue(); _update_image_queue();

2
tools/editor/editor_file_dialog.cpp
View File

@ -1141,7 +1141,7 @@ void EditorFileDialog::set_display_mode(DisplayMode p_mode) {
mode_list->set_pressed(true); mode_list->set_pressed(true);
} }
display_mode=p_mode; display_mode=p_mode;
invalidate();; invalidate();
} }
EditorFileDialog::DisplayMode EditorFileDialog::get_display_mode() const{ EditorFileDialog::DisplayMode EditorFileDialog::get_display_mode() const{

2
tools/editor/editor_import_export.cpp
View File

@ -1173,7 +1173,7 @@ Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path
pd->f->store_32(cs.length()); pd->f->store_32(cs.length());
pd->f->store_buffer((uint8_t*)cs.get_data(),cs.length()); pd->f->store_buffer((uint8_t*)cs.get_data(),cs.length());
TempData td; TempData td;
td.pos=pd->f->get_pos();; td.pos=pd->f->get_pos();
td.ofs=pd->ftmp->get_pos(); td.ofs=pd->ftmp->get_pos();
td.size=p_data.size(); td.size=p_data.size();
pd->file_ofs.push_back(td); pd->file_ofs.push_back(td);

44
tools/editor/editor_node.cpp
View File

@ -841,7 +841,7 @@ bool EditorNode::_find_and_save_edited_subresources(Object *obj,Map<RES,bool>& p
case Variant::DICTIONARY: { case Variant::DICTIONARY: {
Dictionary d=obj->get(E->get().name);; Dictionary d=obj->get(E->get().name);
List<Variant> keys; List<Variant> keys;
d.get_key_list(&keys); d.get_key_list(&keys);
for(List<Variant>::Element *E=keys.front();E;E=E->next()) { for(List<Variant>::Element *E=keys.front();E;E=E->next()) {
@ -926,7 +926,7 @@ void EditorNode::_save_scene_with_preview(String p_file) {
save.step(TTR("Creating Thumbnail"),2); save.step(TTR("Creating Thumbnail"),2);
save.step(TTR("Creating Thumbnail"),3); save.step(TTR("Creating Thumbnail"),3);
Image img = VS::get_singleton()->viewport_get_screen_capture(viewport); Image img = VS::get_singleton()->viewport_get_screen_capture(viewport);
int preview_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");; int preview_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");
preview_size*=EDSCALE; preview_size*=EDSCALE;
int width,height; int width,height;
if (img.get_width() > preview_size && img.get_width() >= img.get_height()) { if (img.get_width() > preview_size && img.get_width() >= img.get_height()) {
@ -1069,7 +1069,7 @@ void EditorNode::_import_action(const String& p_action) {
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("Ugh"); accept->get_ok()->set_text("Ugh");
accept->set_text("Error importing scene."); accept->set_text("Error importing scene.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
return; return;
} }
@ -1085,7 +1085,7 @@ void EditorNode::_import_action(const String& p_action) {
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("Ugh"); accept->get_ok()->set_text("Ugh");
accept->set_text("Error load scene to update."); accept->set_text("Error load scene to update.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
return; return;
} }
@ -1126,7 +1126,7 @@ void EditorNode::_import(const String &p_file) {
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("Ugh"); accept->get_ok()->set_text("Ugh");
accept->set_text("Error importing scene."); accept->set_text("Error importing scene.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
return; return;
} }
@ -2254,7 +2254,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
//confirmation->get_cancel()->hide(); //confirmation->get_cancel()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("This operation can't be done without a tree root."); accept->set_text("This operation can't be done without a tree root.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
break; break;
} }
@ -2276,7 +2276,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
//confirmation->get_cancel()->hide(); //confirmation->get_cancel()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("Please save the scene first."); accept->set_text("Please save the scene first.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
break; break;
} }
@ -2291,7 +2291,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
Ref<EditorExporter> exporter = export_db->get_exporter(target); Ref<EditorExporter> exporter = export_db->get_exporter(target);
if (exporter.is_null()) { if (exporter.is_null()) {
accept->set_text("No exporter for platform '"+target+"' yet."); accept->set_text("No exporter for platform '"+target+"' yet.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
return; return;
} }
@ -2477,7 +2477,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("This operation can't be done without a selected node."); accept->set_text("This operation can't be done without a selected node.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
break; break;
} }
@ -2489,7 +2489,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
//confirmation->get_cancel()->hide(); //confirmation->get_cancel()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("This operation can't be done without a selected node."); accept->set_text("This operation can't be done without a selected node.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
break; break;
} }
@ -2501,7 +2501,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("Ugh"); accept->get_ok()->set_text("Ugh");
accept->set_text("Error loading scene from "+external_file); accept->set_text("Error loading scene from "+external_file);
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
return; return;
} }
@ -2596,20 +2596,20 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
} break; } break;
case OBJECT_COPY_PARAMS: { case OBJECT_COPY_PARAMS: {
editor_data.apply_changes_in_editors();; editor_data.apply_changes_in_editors();
if (current) if (current)
editor_data.copy_object_params(current); editor_data.copy_object_params(current);
} break; } break;
case OBJECT_PASTE_PARAMS: { case OBJECT_PASTE_PARAMS: {
editor_data.apply_changes_in_editors();; editor_data.apply_changes_in_editors();
if (current) if (current)
editor_data.paste_object_params(current); editor_data.paste_object_params(current);
editor_data.get_undo_redo().clear_history(); editor_data.get_undo_redo().clear_history();
} break; } break;
case OBJECT_UNIQUE_RESOURCES: { case OBJECT_UNIQUE_RESOURCES: {
editor_data.apply_changes_in_editors();; editor_data.apply_changes_in_editors();
if (current) { if (current) {
List<PropertyInfo> props; List<PropertyInfo> props;
current->get_property_list(&props); current->get_property_list(&props);
@ -2914,7 +2914,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
break; break;
} }
@ -3370,7 +3370,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
//accept->"()->hide(); //accept->"()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("Optimizer preset not found: "+p_preset); accept->set_text("Optimizer preset not found: "+p_preset);
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
ERR_EXPLAIN("Optimizer preset not found: "+p_preset); ERR_EXPLAIN("Optimizer preset not found: "+p_preset);
ERR_FAIL_V(ERR_INVALID_PARAMETER); ERR_FAIL_V(ERR_INVALID_PARAMETER);
@ -3428,7 +3428,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."); accept->set_text("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.");
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
return ERR_INVALID_DATA; return ERR_INVALID_DATA;
} }
@ -3439,7 +3439,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
//accept->"()->hide(); //accept->"()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("Error saving optimized scene: "+path); accept->set_text("Error saving optimized scene: "+path);
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
ERR_FAIL_COND_V(err,err); ERR_FAIL_COND_V(err,err);
@ -4022,7 +4022,7 @@ void EditorNode::_save_optimized() {
//accept->"()->hide(); //accept->"()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
accept->set_text("Error saving optimized scene: "+path); accept->set_text("Error saving optimized scene: "+path);
accept->popup_centered(Size2(300,70));; accept->popup_centered(Size2(300,70));
return; return;
} }
@ -5459,7 +5459,7 @@ EditorNode::EditorNode() {
#if 0 #if 0
PanelContainer *top_dark_panel = memnew( PanelContainer ); PanelContainer *top_dark_panel = memnew( PanelContainer );
Ref<StyleBoxTexture> top_dark_sb; Ref<StyleBoxTexture> top_dark_sb;
top_dark_sb.instance();; top_dark_sb.instance();
top_dark_sb->set_texture(theme->get_icon("PanelTop","EditorIcons")); top_dark_sb->set_texture(theme->get_icon("PanelTop","EditorIcons"));
for(int i=0;i<4;i++) { for(int i=0;i<4;i++) {
top_dark_sb->set_margin_size(Margin(i),3); top_dark_sb->set_margin_size(Margin(i),3);
@ -5772,7 +5772,7 @@ EditorNode::EditorNode() {
#if 0 #if 0
node_menu = memnew( MenuButton ); node_menu = memnew( MenuButton );
node_menu->set_text("Node"); node_menu->set_text("Node");
node_menu->set_pos( Point2( 50,0) );; node_menu->set_pos( Point2( 50,0) );
menu_panel->add_child( node_menu ); menu_panel->add_child( node_menu );
p=node_menu->get_popup(); p=node_menu->get_popup();
@ -6277,7 +6277,7 @@ EditorNode::EditorNode() {
animation_menu->set_focus_mode(Control::FOCUS_NONE); animation_menu->set_focus_mode(Control::FOCUS_NONE);
menu_panel->add_child(animation_menu); menu_panel->add_child(animation_menu);
animation_menu->set_icon(gui_base->get_icon("Animation","EditorIcons")); animation_menu->set_icon(gui_base->get_icon("Animation","EditorIcons"));
animation_menu->connect("pressed",this,"_animation_visibility_toggle");; animation_menu->connect("pressed",this,"_animation_visibility_toggle");
*/ */

2
tools/editor/editor_profiler.cpp
View File

@ -349,7 +349,7 @@ void EditorProfiler::_update_plot() {
} }
graph_texture->set_data(img);; graph_texture->set_data(img);
graph->set_texture(graph_texture); graph->set_texture(graph_texture);

2
tools/editor/filesystem_dock.cpp
View File

@ -987,7 +987,7 @@ void FileSystemDock::_file_option(int p_option) {
} break; } break;
case FILE_MOVE: { case FILE_MOVE: {
move_dirs.clear();; move_dirs.clear();
move_files.clear(); move_files.clear();
for(int i=0;i<files->get_item_count();i++) { for(int i=0;i<files->get_item_count();i++) {

2
tools/editor/io_plugins/editor_texture_import_plugin.cpp
View File

@ -777,7 +777,7 @@ EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin*
set_hide_on_ok(false); set_hide_on_ok(false);
texture_options = memnew( EditorImportTextureOptions );; texture_options = memnew( EditorImportTextureOptions );
vbc->add_child(texture_options); vbc->add_child(texture_options);
texture_options->set_v_size_flags(SIZE_EXPAND_FILL); texture_options->set_v_size_flags(SIZE_EXPAND_FILL);

12
tools/editor/plugins/animation_tree_editor_plugin.cpp
View File

@ -261,9 +261,9 @@ void AnimationTreeEditor::_popup_edit_dialog() {
} }
edit_option->hide(); edit_option->hide();
edit_button->hide();; edit_button->hide();
filter_button->hide(); filter_button->hide();
edit_check->hide();; edit_check->hide();
Point2 pos = anim_tree->node_get_pos(edited_node)-Point2(h_scroll->get_val(),v_scroll->get_val()); Point2 pos = anim_tree->node_get_pos(edited_node)-Point2(h_scroll->get_val(),v_scroll->get_val());
Ref<StyleBox> style = get_stylebox("panel","PopupMenu"); Ref<StyleBox> style = get_stylebox("panel","PopupMenu");
@ -450,7 +450,7 @@ void AnimationTreeEditor::_popup_edit_dialog() {
edit_label[1]->show(); edit_label[1]->show();
edit_option->set_begin(Point2(15,75)); edit_option->set_begin(Point2(15,75));
edit_option->clear();; edit_option->clear();
for(int i=0;i<anim_tree->transition_node_get_input_count(edited_node);i++) { for(int i=0;i<anim_tree->transition_node_get_input_count(edited_node);i++) {
edit_option->add_item(itos(i),i); edit_option->add_item(itos(i),i);
@ -1452,14 +1452,14 @@ AnimationTreeEditor::AnimationTreeEditor() {
edit_button->set_anchor( MARGIN_RIGHT, ANCHOR_END ); edit_button->set_anchor( MARGIN_RIGHT, ANCHOR_END );
edit_button->set_margin(MARGIN_RIGHT, 10); edit_button->set_margin(MARGIN_RIGHT, 10);
edit_dialog->add_child(edit_button); edit_dialog->add_child(edit_button);
edit_button->hide();; edit_button->hide();
edit_button->connect("pressed", this,"_edit_oneshot_start"); edit_button->connect("pressed", this,"_edit_oneshot_start");
edit_check = memnew( CheckButton ); edit_check = memnew( CheckButton );
edit_check->set_anchor( MARGIN_RIGHT, ANCHOR_END ); edit_check->set_anchor( MARGIN_RIGHT, ANCHOR_END );
edit_check->set_margin(MARGIN_RIGHT, 10); edit_check->set_margin(MARGIN_RIGHT, 10);
edit_dialog->add_child(edit_check); edit_dialog->add_child(edit_check);
edit_check->hide();; edit_check->hide();
edit_check->connect("pressed", this,"_edit_dialog_changed"); edit_check->connect("pressed", this,"_edit_dialog_changed");
file_dialog = memnew( EditorFileDialog ); file_dialog = memnew( EditorFileDialog );
@ -1481,7 +1481,7 @@ AnimationTreeEditor::AnimationTreeEditor() {
filter_button->set_anchor( MARGIN_RIGHT, ANCHOR_END ); filter_button->set_anchor( MARGIN_RIGHT, ANCHOR_END );
filter_button->set_margin(MARGIN_RIGHT, 10); filter_button->set_margin(MARGIN_RIGHT, 10);
edit_dialog->add_child(filter_button); edit_dialog->add_child(filter_button);
filter_button->hide();; filter_button->hide();
filter_button->set_text(TTR("Filters..")); filter_button->set_text(TTR("Filters.."));
filter_button->connect("pressed", this,"_edit_filters"); filter_button->connect("pressed", this,"_edit_filters");

6
tools/editor/plugins/baked_light_baker.cpp
View File

@ -1573,7 +1573,7 @@ double BakedLightBaker::get_normalization(int p_light_idx) const {
double nrg=0; double nrg=0;
const LightData &dl=lights[p_light_idx]; const LightData &dl=lights[p_light_idx];
double cell_area = cell_size*cell_size;; double cell_area = cell_size*cell_size;
//nrg+= /*dl.energy */ (dl.rays_thrown * cell_area / dl.area); //nrg+= /*dl.energy */ (dl.rays_thrown * cell_area / dl.area);
nrg=dl.rays_thrown * cell_area; nrg=dl.rays_thrown * cell_area;
nrg*=(Math_PI*plot_size*plot_size)*0.5; // damping of radial linear gradient kernel nrg*=(Math_PI*plot_size*plot_size)*0.5; // damping of radial linear gradient kernel
@ -1591,7 +1591,7 @@ double BakedLightBaker::get_modifier(int p_light_idx) const {
double nrg=0; double nrg=0;
const LightData &dl=lights[p_light_idx]; const LightData &dl=lights[p_light_idx];
double cell_area = cell_size*cell_size;; double cell_area = cell_size*cell_size;
//nrg+= /*dl.energy */ (dl.rays_thrown * cell_area / dl.area); //nrg+= /*dl.energy */ (dl.rays_thrown * cell_area / dl.area);
nrg=cell_area; nrg=cell_area;
nrg*=(Math_PI*plot_size*plot_size)*0.5; // damping of radial linear gradient kernel nrg*=(Math_PI*plot_size*plot_size)*0.5; // damping of radial linear gradient kernel
@ -2676,7 +2676,7 @@ void BakedLightBaker::clear() {
materials.clear(); materials.clear();
textures.clear(); textures.clear();
lights.clear(); lights.clear();
triangles.clear();; triangles.clear();
endpoint_normal.clear(); endpoint_normal.clear();
endpoint_normal_bits.clear(); endpoint_normal_bits.clear();
baked_octree_texture_w=0; baked_octree_texture_w=0;

8
tools/editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -384,7 +384,7 @@ void CanvasItemEditor::_remove_canvas_item(CanvasItem *p_canvas_item) {
} }
void CanvasItemEditor::_clear_canvas_items() { void CanvasItemEditor::_clear_canvas_items() {
editor_selection->clear();; editor_selection->clear();
#if 0 #if 0
while(canvas_items.size()) while(canvas_items.size())
_remove_canvas_item(canvas_items.front()->key()); _remove_canvas_item(canvas_items.front()->key());
@ -594,7 +594,7 @@ bool CanvasItemEditor::_select(CanvasItem *item, Point2 p_click_pos, bool p_appe
if (!item) { if (!item) {
//clear because nothing clicked //clear because nothing clicked
editor_selection->clear();; editor_selection->clear();
if (p_drag) { if (p_drag) {
drag_from=transform.affine_inverse().xform(p_click_pos); drag_from=transform.affine_inverse().xform(p_click_pos);
@ -2394,7 +2394,7 @@ void CanvasItemEditor::_update_scrollbars() {
Rect2 canvas_item_rect=Rect2(Point2(),screen_rect); Rect2 canvas_item_rect=Rect2(Point2(),screen_rect);
lock_list.clear();; lock_list.clear();
bone_last_frame++; bone_last_frame++;
@ -2901,7 +2901,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
} break;*/ } break;*/
case ANIM_COPY_POSE: { case ANIM_COPY_POSE: {
pose_clipboard.clear();; pose_clipboard.clear();
Map<Node*,Object*> &selection = editor_selection->get_selection(); Map<Node*,Object*> &selection = editor_selection->get_selection();

2
tools/editor/plugins/multimesh_editor_plugin.cpp
View File

@ -177,7 +177,7 @@ void MultiMeshEditor::_populate() {
Map<float,int> triangle_area_map; Map<float,int> triangle_area_map;
for(int i=0;i<facecount;i++) { for(int i=0;i<facecount;i++) {
float area = r[i].get_area();; float area = r[i].get_area();
if (area<CMP_EPSILON) if (area<CMP_EPSILON)
continue; continue;
triangle_area_map[area_accum]=i; triangle_area_map[area_accum]=i;

2
tools/editor/plugins/navigation_polygon_editor_plugin.cpp
View File

@ -127,7 +127,7 @@ bool NavigationPolygonEditor::forward_input_event(const InputEvent& p_event) {
create_nav->set_text("No NavigationPolygon resource on this node.\nCreate and assign one?"); create_nav->set_text("No NavigationPolygon resource on this node.\nCreate and assign one?");
create_nav->popup_centered_minsize(); create_nav->popup_centered_minsize();
} }
return (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index==1);; return (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index==1);
} }

2
tools/editor/plugins/particles_editor_plugin.cpp
View File

@ -210,7 +210,7 @@ void ParticlesEditor::_generate_emission_points() {
for(int i=0;i<geometry.size();i++) { for(int i=0;i<geometry.size();i++) {
float area = geometry[i].get_area();; float area = geometry[i].get_area();
if (area<CMP_EPSILON) if (area<CMP_EPSILON)
continue; continue;
triangle_area_map[area_accum]=i; triangle_area_map[area_accum]=i;

4
tools/editor/plugins/path_editor_plugin.cpp
View File

@ -375,7 +375,7 @@ bool PathEditorPlugin::forward_spatial_input_event(Camera* p_camera,const InputE
ur->create_action(TTR("Split Path")); ur->create_action(TTR("Split Path"));
ur->add_do_method(c.ptr(),"add_point",closest_seg_point,Vector3(),Vector3(),closest_seg+1); ur->add_do_method(c.ptr(),"add_point",closest_seg_point,Vector3(),Vector3(),closest_seg+1);
ur->add_undo_method(c.ptr(),"remove_point",closest_seg+1); ur->add_undo_method(c.ptr(),"remove_point",closest_seg+1);
ur->commit_action();; ur->commit_action();
return true; return true;
} else { } else {
@ -395,7 +395,7 @@ bool PathEditorPlugin::forward_spatial_input_event(Camera* p_camera,const InputE
ur->create_action(TTR("Add Point to Curve")); ur->create_action(TTR("Add Point to Curve"));
ur->add_do_method(c.ptr(),"add_point",it.xform(inters),Vector3(),Vector3(),-1); ur->add_do_method(c.ptr(),"add_point",it.xform(inters),Vector3(),Vector3(),-1);
ur->add_undo_method(c.ptr(),"remove_point",c->get_point_count()); ur->add_undo_method(c.ptr(),"remove_point",c->get_point_count());
ur->commit_action();; ur->commit_action();
return true; return true;
} }

2
tools/editor/plugins/sample_player_editor_plugin.cpp
View File

@ -89,7 +89,7 @@ void SamplePlayerEditor::_update_sample_library() {
Ref<SampleLibrary> sl = node->call("get_sample_library"); Ref<SampleLibrary> sl = node->call("get_sample_library");
if (sl.is_null()) { if (sl.is_null()) {
samples->add_item("<NO SAMPLE LIBRARY>"); samples->add_item("<NO SAMPLE LIBRARY>");
return; //no sample library;; return; //no sample library;
} }
List<StringName> samplenames; List<StringName> samplenames;

10
tools/editor/plugins/spatial_editor_plugin.cpp
View File

@ -2340,7 +2340,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
index=p_index; index=p_index;
editor=p_editor; editor=p_editor;
editor_selection=editor->get_editor_selection();; editor_selection=editor->get_editor_selection();
undo_redo=editor->get_undo_redo(); undo_redo=editor->get_undo_redo();
clicked=0; clicked=0;
clicked_includes_current=false; clicked_includes_current=false;
@ -2593,12 +2593,12 @@ Dictionary SpatialEditor::get_state() const {
d["viewports"]=vpdata; d["viewports"]=vpdata;
d["default_light"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_USE_DEFAULT_LIGHT) );; d["default_light"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_USE_DEFAULT_LIGHT) );
d["ambient_light_color"]=settings_ambient_color->get_color(); d["ambient_light_color"]=settings_ambient_color->get_color();
d["default_srgb"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_USE_DEFAULT_SRGB) );; d["default_srgb"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_USE_DEFAULT_SRGB) );
d["show_grid"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_GRID) );; d["show_grid"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_GRID) );
d["show_origin"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN) );; d["show_origin"]=view_menu->get_popup()->is_item_checked( view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN) );
d["fov"]=get_fov(); d["fov"]=get_fov();
d["znear"]=get_znear(); d["znear"]=get_znear();
d["zfar"]=get_zfar(); d["zfar"]=get_zfar();

2
tools/editor/plugins/theme_editor_plugin.cpp
View File

@ -584,7 +584,7 @@ void ThemeEditor::_theme_menu_cbk(int p_option) {
List<StringName> types; List<StringName> types;
base_theme->get_type_list(&types); base_theme->get_type_list(&types);
type_menu->get_popup()->clear();; type_menu->get_popup()->clear();
if (p_option==0 || p_option==1) {//add if (p_option==0 || p_option==1) {//add

4
tools/editor/project_settings.cpp
View File

@ -818,7 +818,7 @@ void ProjectSettings::_copy_to_platform(int p_which) {
String name = catname+"/"+propname; String name = catname+"/"+propname;
Variant value=Globals::get_singleton()->get(name); Variant value=Globals::get_singleton()->get(name);
catname+="."+popup_platform->get_popup()->get_item_text(p_which);; catname+="."+popup_platform->get_popup()->get_item_text(p_which);
name = catname+"/"+propname; name = catname+"/"+propname;
Globals::get_singleton()->set(name,value); Globals::get_singleton()->set(name,value);
@ -1406,7 +1406,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
Control *input_base = memnew( Control ); Control *input_base = memnew( Control );
input_base->set_name(TTR("Input Map")); input_base->set_name(TTR("Input Map"));
input_base->set_area_as_parent_rect();; input_base->set_area_as_parent_rect();
tab_container->add_child(input_base); tab_container->add_child(input_base);
VBoxContainer *vbc = memnew( VBoxContainer ); VBoxContainer *vbc = memnew( VBoxContainer );

2
tools/editor/reparent_dialog.cpp
View File

@ -107,7 +107,7 @@ ReparentDialog::ReparentDialog() {
vbc->add_child(keep_transform); vbc->add_child(keep_transform);
//vbc->add_margin_child("Options:",node_only);; //vbc->add_margin_child("Options:",node_only);
//cancel->connect("pressed", this,"_cancel"); //cancel->connect("pressed", this,"_cancel");

2
tools/editor/resources_dock.cpp
View File

@ -122,7 +122,7 @@ void ResourcesDock::_notification(int p_what) {
void ResourcesDock::save_resource(const String& p_path,const Ref<Resource>& p_resource) { void ResourcesDock::save_resource(const String& p_path,const Ref<Resource>& p_resource) {
editor->get_editor_data().apply_changes_in_editors();; editor->get_editor_data().apply_changes_in_editors();
int flg=0; int flg=0;
if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources")) if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources"))
flg|=ResourceSaver::FLAG_COMPRESS; flg|=ResourceSaver::FLAG_COMPRESS;

2
tools/editor/script_editor_debugger.cpp
View File

@ -1187,7 +1187,7 @@ void ScriptEditorDebugger::_profiler_seeked() {
if (breaked) if (breaked)
return; return;
debug_break();; debug_break();
} }

2
tools/editor/spatial_editor_gizmos.cpp
View File

@ -2168,7 +2168,7 @@ void VisibilityNotifierGizmo::set_handle(int p_idx,Camera *p_camera, const Point
Vector3 ray_dir = p_camera->project_ray_normal(p_point); Vector3 ray_dir = p_camera->project_ray_normal(p_point);
Vector3 sg[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)}; Vector3 sg[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};
Vector3 ofs = aabb.pos+aabb.size*0.5;; Vector3 ofs = aabb.pos+aabb.size*0.5;
Vector3 axis; Vector3 axis;
axis[p_idx]=1.0; axis[p_idx]=1.0;