Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-08-30 16:36:39 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-09-14 10:53:57 +0300
commit1c1be5bdf4fb9be0658b7d0b1ac13c563a003f1a (patch)
tree38c7b72f1343f99b9d1abf98cee09fae456a7e52 /source/blender/editors/space_outliner
parent30845b5c8e042f42331b0c2a8a57ad05837b114e (diff)
Fix T90862: Texts in Outliner can have wrong icon
In contrast to the Filebrowser, the Outliner (Blender File view) did not distinguish icons for text-based formats (if they have a filepath this can be done though). Maniphest Tasks: T90862 Differential Revision: https://developer.blender.org/D12347
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index db37c8c1c8c..a094dfb0834 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -32,6 +32,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_sequence_types.h"
+#include "DNA_text_types.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"
@@ -59,6 +60,7 @@
#include "DEG_depsgraph_build.h"
#include "ED_armature.h"
+#include "ED_fileselect.h"
#include "ED_outliner.h"
#include "ED_screen.h"
@@ -2625,9 +2627,17 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
case ID_NLA:
data.icon = ICON_NLA;
break;
- case ID_TXT:
- data.icon = ICON_SCRIPT;
+ case ID_TXT: {
+ Text *text = (Text *)tselem->id;
+ if (text->filepath == NULL || (text->flags & TXT_ISMEM)) {
+ data.icon = ICON_FILE_TEXT;
+ }
+ else {
+ /* Helps distinguish text-based formats like the filebrowser does. */
+ data.icon = ED_file_extension_icon(text->filepath);
+ }
break;
+ }
case ID_GR:
data.icon = ICON_OUTLINER_COLLECTION;
break;