edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 22:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7735 from archimede67/fix-editor-multi-edit-issues

Browse source 
Editor: fix duplicate layers in popup layer context
This commit is contained in:
Dennis Felsing 2023-12-27 23:10:34 +00:00 committed by GitHub
parent 15e6e5eeab 83540ade5c
commit e8da11bcf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/editor/editor.cpp
View file

@ -4072,6 +4072,9 @@ void CEditor::RenderLayers(CUIRect LayersBox)
} }
else if(Result == 2) else if(Result == 2)
{ {
s_LayerPopupContext.m_vpLayers.clear();
s_LayerPopupContext.m_vLayerIndices.clear();
if(!IsLayerSelected) if(!IsLayerSelected)
{ {
SelectLayer(i, g); SelectLayer(i, g);
@ -4099,11 +4102,6 @@ void CEditor::RenderLayers(CUIRect LayersBox)
s_LayerPopupContext.m_vLayerIndices.clear(); s_LayerPopupContext.m_vLayerIndices.clear();
} }
} }
else
{
s_LayerPopupContext.m_vpLayers.clear();
s_LayerPopupContext.m_vLayerIndices.clear();
}
UI()->DoPopupMenu(&s_LayerPopupContext, UI()->MouseX(), UI()->MouseY(), 120, 270, &s_LayerPopupContext, PopupLayer); UI()->DoPopupMenu(&s_LayerPopupContext, UI()->MouseX(), UI()->MouseY(), 120, 270, &s_LayerPopupContext, PopupLayer);
} }