Skip to content

Commit

Permalink
Fixed object assignment buttons in tile collision editor
Browse files Browse the repository at this point in the history
Unless I'm missing something, this was only due to the missing
ObjectReferenceTool instance in the tile collision editor.

Closes #3399
  • Loading branch information
bjorn committed May 16, 2024
1 parent 288cd98 commit b47a6dd
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
* Fixed possible crash after a scripted tool disappears while active
* Fixed updating of used tilesets after resizing map (#3884)
* Fixed alignment of shortcuts in action search
* Fixed object assignment buttons in tile collision editor (#3399)
* AppImage: Fixed ability to open paths with spaces from the CLI (#3914)
* AppImage: Updated to Sentry 0.6.7

Expand Down
2 changes: 1 addition & 1 deletion src/tiled/mapeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ MapEditor::MapEditor(QObject *parent)
mToolsToolBar->addAction(mToolManager->registerTool(new LayerOffsetTool(this)));
mToolsToolBar->addSeparator(); // todo: hide when there are no tool extensions

const auto tools = PluginManager::instance()->objects<AbstractTool>();
const auto tools = PluginManager::objects<AbstractTool>();
for (auto tool : tools)
mToolsToolBar->addAction(mToolManager->registerTool(tool));

Expand Down
2 changes: 2 additions & 0 deletions src/tiled/tilecollisiondock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "mapscene.h"
#include "mapview.h"
#include "objectgroup.h"
#include "objectreferencetool.h"
#include "objectselectiontool.h"
#include "objectsview.h"
#include "preferences.h"
Expand Down Expand Up @@ -110,6 +111,7 @@ TileCollisionDock::TileCollisionDock(QWidget *parent)

mToolManager = new ToolManager(this);
toolsToolBar->addAction(mToolManager->registerTool(new ObjectSelectionTool(this)));
toolsToolBar->addAction(mToolManager->registerTool(new ObjectReferenceTool(this)));
toolsToolBar->addAction(mToolManager->registerTool(new EditPolygonTool(this)));
toolsToolBar->addAction(mToolManager->registerTool(rectangleObjectsTool));
toolsToolBar->addAction(mToolManager->registerTool(pointObjectsTool));
Expand Down

0 comments on commit b47a6dd

Please sign in to comment.