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

Merge pull request #23519 from Rubonnek/remove-unnecessary-assignments 

Removed unnecessary assignments
This commit is contained in:
Rémi Verschelde 2018-11-05 09:05:03 +01:00 committed by GitHub
parent 935537c531 71df4caf8f
commit fcd761e889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_inspector.cpp
View File

@ -1143,10 +1143,8 @@ void EditorInspectorSection::_notification(int p_what) {
Color color = get_color("font_color", "Tree"); Color color = get_color("font_color", "Tree");
draw_string(font, Point2(hs, font->get_ascent() + (h - font->get_height()) / 2).floor(), label, color, get_size().width); draw_string(font, Point2(hs, font->get_ascent() + (h - font->get_height()) / 2).floor(), label, color, get_size().width);
int ofs = 0;
if (arrow.is_valid()) { if (arrow.is_valid()) {
draw_texture(arrow, Point2(get_size().width - arrow->get_width(), (h - arrow->get_height()) / 2).floor()); draw_texture(arrow, Point2(get_size().width - arrow->get_width(), (h - arrow->get_height()) / 2).floor());
ofs += hs + arrow->get_width();
} }
} }
} }

1
modules/gdscript/gdscript_parser.cpp
View File

@ -7080,7 +7080,6 @@ GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType
DataType member_type; DataType member_type;
for (int i = 0; i < current_class->variables.size(); i++) { for (int i = 0; i < current_class->variables.size(); i++) {
ClassNode::Member m = current_class->variables[i];
if (current_class->variables[i].identifier == p_identifier) { if (current_class->variables[i].identifier == p_identifier) {
member_type = current_class->variables[i].data_type; member_type = current_class->variables[i].data_type;
current_class->variables.write[i].usages += 1; current_class->variables.write[i].usages += 1;

1
scene/2d/line_builder.cpp
View File

@ -294,7 +294,6 @@ void LineBuilder::build() {
if (texture_mode == Line2D::LINE_TEXTURE_TILE) { if (texture_mode == Line2D::LINE_TEXTURE_TILE) {
uvx1 = current_distance1 / (width * tile_aspect); uvx1 = current_distance1 / (width * tile_aspect);
} else if (texture_mode == Line2D::LINE_TEXTURE_STRETCH) { } else if (texture_mode == Line2D::LINE_TEXTURE_STRETCH) {
uvx0 = current_distance0 / total_distance;
uvx1 = current_distance1 / total_distance; uvx1 = current_distance1 / total_distance;
} }

3
scene/animation/animation_blend_tree.cpp
View File

@ -266,7 +266,6 @@ float AnimationNodeOneShot::process(float p_time, bool p_seek) {
if (do_start) { if (do_start) {
remaining = os_rem; remaining = os_rem;
do_start = false;
} }
if (!p_seek) { if (!p_seek) {
@ -770,8 +769,6 @@ float AnimationNodeTransition::process(float p_time, bool p_seek) {
rem = blend_input(current, p_time, p_seek, 1.0 - blend, FILTER_IGNORE, false); rem = blend_input(current, p_time, p_seek, 1.0 - blend, FILTER_IGNORE, false);
} }
switched = false;
if (p_seek) { // don't seek prev animation if (p_seek) { // don't seek prev animation
blend_input(prev, 0, false, blend, FILTER_IGNORE, false); blend_input(prev, 0, false, blend, FILTER_IGNORE, false);
time = p_time; time = p_time;

1
scene/animation/animation_node_state_machine.cpp
View File

@ -345,7 +345,6 @@ float AnimationNodeStateMachinePlayback::process(AnimationNodeStateMachine *sm,
len_current = sm->blend_node(current, sm->states[current].node, 0, true, 1.0, AnimationNode::FILTER_IGNORE, false); len_current = sm->blend_node(current, sm->states[current].node, 0, true, 1.0, AnimationNode::FILTER_IGNORE, false);
pos_current = 0; pos_current = 0;
loops_current = 0; loops_current = 0;
play_start = false;
} }
if (!sm->states.has(current)) { if (!sm->states.has(current)) {