diff options
author | Jacques Lucke <mail@jlucke.com> | 2019-10-13 19:12:07 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2019-10-13 19:12:07 +0300 |
commit | faf2184f52ad32e90420a1ec827aab7288114626 (patch) | |
tree | 8145c00e050f5b87d2bcaebbeb5597b86aa4b139 /source/blender/editors/space_outliner/outliner_draw.c | |
parent | 65e6598e7eb492b8bc7fe80306568a564e8f556d (diff) | |
parent | bde328352be2aa7f7227dd48ce0ef64ba80da2d4 (diff) |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 84125a5ee00..c5271e9df06 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -2423,7 +2423,6 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case OB_GPENCIL: data.icon = ICON_OUTLINER_OB_GREASEPENCIL; break; - break; } } else { |