From 31d41d83c38924a4c5b46e84b8be9f24a0f08c05 Mon Sep 17 00:00:00 2001 From: Dennis Brakhane Date: Sun, 25 Apr 2021 17:03:56 +0200 Subject: [PATCH] Remove duplicate comments A few single line comments were duplicated, probably due to bad merges. This commit removes the obviously duplicate ones. --- modules/fbx/editor_scene_importer_fbx.cpp | 1 - servers/rendering/renderer_rd/renderer_storage_rd.cpp | 1 - servers/rendering/shader_language.cpp | 3 --- .../CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp | 1 - .../BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp | 1 - .../Featherstone/btMultiBodySphericalJointMotor.cpp | 1 - 6 files changed, 8 deletions(-) diff --git a/modules/fbx/editor_scene_importer_fbx.cpp b/modules/fbx/editor_scene_importer_fbx.cpp index b23a58a414b4..edea1963a7d2 100644 --- a/modules/fbx/editor_scene_importer_fbx.cpp +++ b/modules/fbx/editor_scene_importer_fbx.cpp @@ -1013,7 +1013,6 @@ Node3D *EditorSceneImporterFBX::_generate_scene( const uint64_t target_id = track->key(); int track_idx = animation->add_track(Animation::TYPE_TRANSFORM); - // animation->track_set_path(track_idx, node_path); // animation->track_set_path(track_idx, node_path); Ref bone; diff --git a/servers/rendering/renderer_rd/renderer_storage_rd.cpp b/servers/rendering/renderer_rd/renderer_storage_rd.cpp index 189c5782f412..540b32481bcf 100644 --- a/servers/rendering/renderer_rd/renderer_storage_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_storage_rd.cpp @@ -7922,7 +7922,6 @@ void RendererStorageRD::global_variable_set_override(const StringName &p_name, c _global_variable_mark_buffer_dirty(gv.buffer_index, gv.buffer_elements); } else { - //texture //texture for (Set::Element *E = gv.texture_materials.front(); E; E = E->next()) { Material *material = material_owner.getornull(E->get()); diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index f5228f9747cd..32c38e913854 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -3955,8 +3955,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons ERR_FAIL_COND_V(!expr, nullptr); - /* OK now see what's NEXT to the operator.. */ - /* OK now see what's NEXT to the operator.. */ /* OK now see what's NEXT to the operator.. */ while (true) { @@ -4734,7 +4732,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons ERR_FAIL_COND_V(next_op == -1, nullptr); - // OK! create operator.. // OK! create operator.. if (is_unary) { int expr_pos = next_op; diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp index 6873a95d90ad..c79623bd57d7 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp @@ -80,7 +80,6 @@ struct ClipVertex btVector3 v; int id; //b2ContactID id; - //b2ContactID id; }; #define b2Dot(a, b) (a).dot(b) diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp index fec9b03213a7..4372489fa10b 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp @@ -42,7 +42,6 @@ void btMultiBodyJointMotor::finalizeMultiDof() int linkDoF = 0; unsigned int offset = 6 + (m_bodyA->getLink(m_linkA).m_dofOffset + linkDoF); - // row 0: the lower bound // row 0: the lower bound jacobianA(0)[offset] = 1; diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp index 25ddd539bf91..5c20d2a0d4f2 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp +++ b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp @@ -44,7 +44,6 @@ void btMultiBodySphericalJointMotor::finalizeMultiDof() int linkDoF = 0; unsigned int offset = 6 + (m_bodyA->getLink(m_linkA).m_dofOffset + linkDoF); - // row 0: the lower bound // row 0: the lower bound jacobianA(0)[offset] = 1;