Skip to content

Commit ae19572

Browse files
authored
Merge pull request o3de#17573 from aws-lumberyard-dev/daimini/AssetDropFix
Inspector | Fix asset dropping into asset input fields
2 parents 85fed6d + d8c908f commit ae19572

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ namespace AzAssetBrowserRequestHandlerPrivate
194194
return validEntries[0];
195195
}
196196

197-
// return true if a given product has an asociated component type.
197+
// return true if a given product has an associated component type.
198198
bool ProductHasAssociatedComponent(const ProductAssetBrowserEntry* product)
199199
{
200200
if (!product)

Code/Framework/AzCore/AzCore/Asset/AssetTypeInfoBus.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ namespace AZ
6161

6262
//! Used to assign a sort order to assets in the case where the user
6363
//! drags and drops a source file (like a FBX, but others too) which result in many
64-
//! different products of different types. Creating entities for each will cause a jumbled
64+
//! different products of different types. Creating entities for each will cause a jumbled
6565
//! mess, so instead, the products will be sorted using this value as a hint
6666
//! and the first one in the resulting list will be picked to represent the drop operation.
67-
//! Highest number wins. In the case of ties, the list will also be sorted alphabetically
67+
//! Highest number wins. In the case of ties, the list will also be sorted alphabetically
6868
//! and give a higher weight to assets with the same name as the source file that produced them.
6969
virtual int GetAssetTypeDragAndDropCreationPriority() const { return s_NormalPriority; }
7070
};

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ namespace AzToolsFramework
9191
pLayout->setContentsMargins(0, 0, 0, 0);
9292
pLayout->setSpacing(2);
9393

94+
m_browseEdit->lineEdit()->setAcceptDrops(false);
9495
setAcceptDrops(true);
9596

9697
m_thumbnail = new ThumbnailPropertyCtrl(this);

0 commit comments

Comments
 (0)