summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp12
-rw-r--r--src/Authoring/Studio/images.qrc4
-rw-r--r--src/Authoring/Studio/images/matdef-active.pngbin0 -> 579 bytes
-rw-r--r--src/Authoring/Studio/images/matdef-active@2x.pngbin0 -> 774 bytes
-rw-r--r--src/Authoring/Studio/images/matdef-disabled.pngbin0 -> 613 bytes
-rw-r--r--src/Authoring/Studio/images/matdef-disabled@2x.pngbin0 -> 788 bytes
6 files changed, 16 insertions, 0 deletions
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp
index c4e7e703..0fbf52f9 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioObjectTypes.cpp
@@ -196,6 +196,10 @@ const QString &CStudioObjectTypes::GetNormalIconName(EStudioObjectType inType)
static QString theString = QStringLiteral("qml_used.png");
return theString;
}
+ case OBJTYPE_MATERIALDATA: {
+ static QString theString = QStringLiteral("matdef-active.png");
+ return theString;
+ }
default: {
static QString theString = QStringLiteral("Objects-Model-Normal.png");
return theString;
@@ -293,6 +297,10 @@ const QString &CStudioObjectTypes::GetDisabledIconName(EStudioObjectType inType)
static QString theString = QStringLiteral("qml_notUsed.png");
return theString;
}
+ case OBJTYPE_MATERIALDATA: {
+ static QString theString = QStringLiteral("matdef-disabled.png");
+ return theString;
+ }
default: {
static QString theString = QStringLiteral("Objects-Model-Disabled.png");
return theString;
@@ -382,6 +390,10 @@ const QString &CStudioObjectTypes::GetHighlightIconName(EStudioObjectType inType
static QString theString = QStringLiteral("presentation_used.png");
return theString;
}
+ case OBJTYPE_MATERIALDATA: {
+ static QString theString = QStringLiteral("matdef-active.png");
+ return theString;
+ }
default: {
static QString theString = QStringLiteral("Objects-Model-Normal.png");
return theString;
diff --git a/src/Authoring/Studio/images.qrc b/src/Authoring/Studio/images.qrc
index 28dab9a5..e57eee1d 100644
--- a/src/Authoring/Studio/images.qrc
+++ b/src/Authoring/Studio/images.qrc
@@ -282,6 +282,10 @@
<file>images/timeline_text_shown@2x.png</file>
<file>images/timeline_text_hidden.png</file>
<file>images/timeline_text_hidden@2x.png</file>
+ <file>images/matdef-active.png</file>
+ <file>images/matdef-active@2x.png</file>
+ <file>images/matdef-disabled.png</file>
+ <file>images/matdef-disabled@2x.png</file>
</qresource>
<qresource prefix="/startup">
<file alias="open_dialog.png">images/open_dialog.png</file>
diff --git a/src/Authoring/Studio/images/matdef-active.png b/src/Authoring/Studio/images/matdef-active.png
new file mode 100644
index 00000000..89861be9
--- /dev/null
+++ b/src/Authoring/Studio/images/matdef-active.png
Binary files differ
diff --git a/src/Authoring/Studio/images/matdef-active@2x.png b/src/Authoring/Studio/images/matdef-active@2x.png
new file mode 100644
index 00000000..5098de4e
--- /dev/null
+++ b/src/Authoring/Studio/images/matdef-active@2x.png
Binary files differ
diff --git a/src/Authoring/Studio/images/matdef-disabled.png b/src/Authoring/Studio/images/matdef-disabled.png
new file mode 100644
index 00000000..09bf4ad8
--- /dev/null
+++ b/src/Authoring/Studio/images/matdef-disabled.png
Binary files differ
diff --git a/src/Authoring/Studio/images/matdef-disabled@2x.png b/src/Authoring/Studio/images/matdef-disabled@2x.png
new file mode 100644
index 00000000..eeb66286
--- /dev/null
+++ b/src/Authoring/Studio/images/matdef-disabled@2x.png
Binary files differ