Merge branch 'master' into sdl2.0
This commit is contained in:
commit
27dd0f4db5
1 changed files with 0 additions and 5 deletions
|
|
@ -3126,8 +3126,6 @@ static void mainloop(void)
|
||||||
|
|
||||||
if (label_node_to_edit)
|
if (label_node_to_edit)
|
||||||
select_label_node(&old_x, &old_y);
|
select_label_node(&old_x, &old_y);
|
||||||
|
|
||||||
do_render_cur_text(0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (cur_tool == TOOL_LABEL && cur_label == LABEL_APPLY)
|
else if (cur_tool == TOOL_LABEL && cur_label == LABEL_APPLY)
|
||||||
|
|
@ -5236,8 +5234,6 @@ static void mainloop(void)
|
||||||
|
|
||||||
if (label_node_to_edit)
|
if (label_node_to_edit)
|
||||||
select_label_node(&old_x, &old_y);
|
select_label_node(&old_x, &old_y);
|
||||||
|
|
||||||
do_render_cur_text(0);
|
|
||||||
}
|
}
|
||||||
else if (cur_tool == TOOL_LABEL && cur_label == LABEL_APPLY)
|
else if (cur_tool == TOOL_LABEL && cur_label == LABEL_APPLY)
|
||||||
{
|
{
|
||||||
|
|
@ -29249,7 +29245,6 @@ static void select_label_node(int * old_x, int * old_y) {
|
||||||
}
|
}
|
||||||
|
|
||||||
update_screen_rect(&r_toolopt);
|
update_screen_rect(&r_toolopt);
|
||||||
do_render_cur_text(0);
|
|
||||||
|
|
||||||
/* Redraw color palette, fonts, and text controls */
|
/* Redraw color palette, fonts, and text controls */
|
||||||
draw_colors(COLORSEL_REFRESH);
|
draw_colors(COLORSEL_REFRESH);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue