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
path: root/source
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2019-06-13 21:38:31 +0300
committerAntonioya <blendergit@gmail.com>2019-06-13 21:38:44 +0300
commit1688a57a8e68a71bf16acea1f78395b19406e601 (patch)
tree32404beffa42342930940b6523a090a38c47a81b /source
parent0b40af97f41137b083dedbf64b0685f9f0fb1987 (diff)
Fix T65783: Gpencil Edit mode doesn't round data icon
See D5071 for more details Thanks to @brecht for his help
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index feff1dc5f4a..2541d0a935c 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -116,6 +116,12 @@ static void outliner_tree_dimensions(SpaceOutliner *soops, int *r_width, int *r_
static bool is_object_data_in_editmode(const ID *id, const Object *obact)
{
const short id_type = GS(id->name);
+
+ if (id_type == ID_GD && obact && obact->data == id) {
+ bGPdata *gpd = (bGPdata *)id;
+ return GPENCIL_EDIT_MODE(gpd);
+ }
+
return ((obact && (obact->mode & OB_MODE_EDIT)) && (id && OB_DATA_SUPPORT_EDITMODE(id_type)) &&
(GS(((ID *)obact->data)->name) == id_type) && BKE_object_data_is_in_editmode(id));
}