diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-03-12 13:16:44 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-03-12 13:16:44 +0300 |
| commit | 4a8a7cc3cafba9fa00db0c66aae73f43be923a28 (patch) | |
| tree | 2428bc6dd3b291e80f06de78831932e60c148956 /source/blender/editors/space_outliner/outliner_draw.c | |
| parent | 78d8e9f962f619c07fe5704cb1cc108f760b84e9 (diff) | |
| parent | 6c707aad6a2e0cc6f5d3b561c32fabc2663cdb0e (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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 49a7b2ee5dd..32c2320e6d0 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -817,7 +817,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) bGPDlayer *gpl = te->directdata; /* always make layer active */ - BKE_gpencil_layer_setactive(gpd, gpl); + BKE_gpencil_layer_active_set(gpd, gpl); // XXX: name needs translation stuff BLI_uniquename( @@ -2256,6 +2256,9 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case eGpencilModifierType_Armature: data.icon = ICON_MOD_ARMATURE; break; + case eGpencilModifierType_Vertexcolor: + data.icon = ICON_MOD_NORMALEDIT; + break; /* Default */ default: |