Skip to content

bugfix(worldbuilder): fix optimized trees not being shown in object placer preview window #2312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViTeXFTW wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −0
Open

bugfix(worldbuilder): fix optimized trees not being shown in object placer preview window #2312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b113ad
bugfix(worldbuilder): fix optimized trees not being shown in object p…
ViTeXFTW Feb 15, 2026
01e291e
refactor: updated codestyle to adhere to review comments
ViTeXFTW Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "intersec.h"
#include "W3DDevice/GameClient/W3DAssetManager.h"
#include "W3DDevice/GameClient/Module/W3DModelDraw.h"
#include "W3DDevice/GameClient/Module/W3DTreeDraw.h"
#include "agg_def.h"
#include "part_ldr.h"
#include "hanim.h"
Expand Down Expand Up @@ -1118,6 +1119,15 @@ AsciiString WbView3d::getBestModelName(const ThingTemplate* tt, const ModelCondi
{
return md->getBestModelNameForWB(c);
}

// TheSuperHackers @bugfix ViTeXFTW 15/02/2025 Fix tree objects not showing
// a preview in WB object placer. The W3DTreeDraw module stores its model name
// differently from W3DModelDraw.
const W3DTreeDrawModuleData* treeData = mdd ? mdd->getAsW3DTreeDrawModuleData() : nullptr;
if (treeData)
{
return treeData->m_modelName;
}
}
}
// removing this crash as sounds can (and should) have no model - jkmcd
Expand Down
Loading