diff options
| author | YimingWu <xp8110@outlook.com> | 2021-07-04 08:23:52 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2021-07-04 08:23:52 +0300 |
| commit | 442f269a72e8f07393fd246f642e210171a1c9bc (patch) | |
| tree | ecab515215209172245f7709a0c07c1b14dab96c /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 87dae08dd3f2a80dd208576b130cabaca21c9912 (diff) | |
| parent | 2d146b61d8583ec7169c5c04263d475a542b06ce (diff) | |
Merge remote-tracking branch 'origin/master' into lineart-bvh
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 328a787c768..69680f57d98 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1090,7 +1090,8 @@ static void outliner_draw_restrictbuts(uiBlock *block, RestrictPropertiesActive props_active = props_active_parent; if (te->ys + 2 * UI_UNIT_Y >= region->v2d.cur.ymin && te->ys <= region->v2d.cur.ymax) { - if (tselem->type == TSE_R_LAYER && (space_outliner->outlinevis == SO_SCENES)) { + if (tselem->type == TSE_R_LAYER && + ELEM(space_outliner->outlinevis, SO_SCENES, SO_VIEW_LAYER)) { if (space_outliner->show_restrict_flags & SO_RESTRICT_RENDER) { /* View layer render toggle. */ ViewLayer *layer = te->directdata; @@ -2355,6 +2356,9 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case eGpencilModifierType_Texture: data.icon = ICON_TEXTURE; break; + case eGpencilModifierType_Weight: + data.icon = ICON_MOD_VERTEX_WEIGHT; + break; /* Default */ default: @@ -3125,7 +3129,7 @@ static void outliner_draw_tree_element(bContext *C, *te_edit = te; } - /* Icons can be ui buts, we don't want it to overlap with restrict .*/ + /* Icons can be UI buts, we don't want it to overlap with restrict. */ if (restrict_column_width > 0) { xmax -= restrict_column_width + UI_UNIT_X; } |