birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit 5f214be

Browse Source
This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/LensFlareEditor/LensFlareElementTree.cpp
+7 -7
View File
@@ -737,8 +737,8 @@ bool LensFlareElementTreeModel::removeRows(int row, int count, const QModelIndex
QStringList LensFlareElementTreeModel::mimeTypes() const
{
QStringList types;
types << QStringLiteral("application/x-lumberyard-flareelements");
types << QStringLiteral("application/x-lumberyard-flaretypes");
types << QStringLiteral("application/x-o3de-flareelements");
types << QStringLiteral("application/x-o3de-flaretypes");
return types;
}
@@ -754,7 +754,7 @@ QMimeData* LensFlareElementTreeModel::mimeData(const QModelIndexList& indexes) c
array.append(reinterpret_cast<const char*>(&pElement), sizeof(CLensFlareElement*));
}
data->setData(QStringLiteral("application/x-lumberyard-flareelements"), array);
data->setData(QStringLiteral("application/x-o3de-flareelements"), array);
return data;
}
@@ -1052,11 +1052,11 @@ bool LensFlareElementTreeModel::MoveElement(CLensFlareElement* pElement, int row
bool LensFlareElementTreeModel::dropMimeData(const QMimeData* data, [[maybe_unused]] Qt::DropAction action, int row, [[maybe_unused]] int column, const QModelIndex& parent)
{
if (data->hasFormat(QStringLiteral("application/x-lumberyard-flaretypes")))
if (data->hasFormat(QStringLiteral("application/x-o3de-flaretypes")))
{
// drop from atomic list
QByteArray encoded = data->data(QStringLiteral("application/x-lumberyard-flaretypes"));
QByteArray encoded = data->data(QStringLiteral("application/x-o3de-flaretypes"));
QDataStream stream(&encoded, QIODevice::ReadOnly);
while (!stream.atEnd())
@@ -1070,9 +1070,9 @@ bool LensFlareElementTreeModel::dropMimeData(const QMimeData* data, [[maybe_unus
return true;
}
else if (data->hasFormat(QStringLiteral("application/x-lumberyard-flareelements")))
else if (data->hasFormat(QStringLiteral("application/x-o3de-flareelements")))
{
QByteArray array = data->data("application/x-lumberyard-flareelements");
QByteArray array = data->data("application/x-o3de-flareelements");
int count = array.size() / sizeof(CLensFlareElement*);
auto ppElements = reinterpret_cast<CLensFlareElement**>(array.data());