port several QtFRED fixes to FRED#7622
Merged
Merged
Conversation
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
added
fix
wookieejedi
approved these changes
Jul 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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: