Merge branch 'instanceselectionmode' into 'master'

Fix instance selection mode destruction (#7447)

Closes #7447

See merge request OpenMW/openmw!3945
fix-osga-rotate-wildly
Evil Eye 9 months ago
commit 781e797810

@ -99,6 +99,7 @@
Bug #7415: Unbreakable lock discrepancies Bug #7415: Unbreakable lock discrepancies
Bug #7416: Modpccrimelevel is different from vanilla Bug #7416: Modpccrimelevel is different from vanilla
Bug #7428: AutoCalc flag is not used to calculate enchantment costs Bug #7428: AutoCalc flag is not used to calculate enchantment costs
Bug #7447: OpenMW-CS: Dragging a cell of a different type (from the initial type) into the 3D view crashes OpenMW-CS
Bug #7450: Evading obstacles does not work for actors missing certain animations Bug #7450: Evading obstacles does not work for actors missing certain animations
Bug #7459: Icons get stacked on the cursor when picking up multiple items simultaneously Bug #7459: Icons get stacked on the cursor when picking up multiple items simultaneously
Bug #7472: Crash when enchanting last projectiles Bug #7472: Crash when enchanting last projectiles

@ -58,7 +58,8 @@ namespace CSVRender
InstanceSelectionMode::~InstanceSelectionMode() InstanceSelectionMode::~InstanceSelectionMode()
{ {
mParentNode->removeChild(mBaseNode); if (mBaseNode)
mParentNode->removeChild(mBaseNode);
} }
void InstanceSelectionMode::setDragStart(const osg::Vec3d& dragStart) void InstanceSelectionMode::setDragStart(const osg::Vec3d& dragStart)

Loading…
Cancel
Save