Skip to content

port several QtFRED fixes to FRED#7622

Open
Goober5000 wants to merge 4 commits into
scp-fs2open:masterfrom
Goober5000:fix/port_to_fred
Open

port several QtFRED fixes to FRED#7622
Goober5000 wants to merge 4 commits into
scp-fs2open:masterfrom
Goober5000:fix/port_to_fred

Conversation

@Goober5000

Copy link
Copy Markdown
Contributor

Any FRED fixes should be ported to QtFRED and vice versa. This PR covers the QtFRED fixes from #7402 and #7403 that are applicable to FRED:

  • Don't apply reinforcement or destroy-before-mission flags to player starting ships
  • Don't wipe a ship's team color when the Initial Status combo is disabled
  • Render team colors on ships in the FRED viewport
  • Handle props in the Object Orientation editor

Goober5000 and others added 4 commits July 19, 2026 00:16
The ship flags dialog disables these checkboxes only when the selection
consists solely of player starts.  In a mixed selection (player start plus
regular ship), OnOK() ran update_ship() on the marked player starts too,
and set_reinforcement() would emplace a reinforcement entry for the player
before the ship_name_lookup() (which skips player starts) failed, leaving
a bogus Reinforcements entry that persisted into the saved mission, plus
an Int3() in debug builds.  Skip both flags for OBJ_START, matching the
qtFRED fix in scp-fs2open#7402.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
The team color combo box is only populated and enabled in single-edit
mode for a ship class that uses team colors.  In multi-edit (or for a
class without team colors) the combo stays disabled, and OnOK() fell
into the unconditional else branch that reset the current ship's
team_name to none.  Only apply the combo selection when the combo is
actually enabled, matching the qtFRED fix in scp-fs2open#7403.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
render_one_model() never passed the ship's team color to the model
renderer, so ships with an assigned team color displayed with their
class defaults.  Set it the same way qtFRED does since scp-fs2open#7403.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
The object list in orient_editor::OnInitDialog() predates props, so
every prop in the mission fired the "Unknown object type" warning when
the dialog opened, and props could not be selected as point-to targets.
Add them to the list like qtFRED does since scp-fs2open#7402.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@Goober5000 Goober5000 added fix A fix for bugs, not-a-bugs, and/or regressions. fred A feature or issue related to the FReespace EDitor (FRED) labels Jul 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fix A fix for bugs, not-a-bugs, and/or regressions. fred A feature or issue related to the FReespace EDitor (FRED)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants