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>2019-03-04 13:51:11 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-03-04 15:04:41 +0300
commitbaee9b014ab0950db4730439098f35df6ea80291 (patch)
tree247b8fb7f10be3b89a486906babfe314f8e09729 /source/blender/editors/space_outliner
parenta53dccb2a9cabd0141cb7efb7959acfd4ea24dad (diff)
Outliner: better support for paintcurves ('Blender File' view)
- paintcurves were hitting an assert in outliner_add_element() - missing outliner update when adding a paintcurve - paintcurves were not showing an icon [they dont have a dedicated icon, took the one used elsewhere] Reviewers: brecht Differential Revision: https://developer.blender.org/D4445
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c2
-rw-r--r--source/blender/editors/space_outliner/outliner_intern.h2
-rw-r--r--source/blender/editors/space_outliner/space_outliner.c5
3 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index fba5b70392a..044ab8f1b7b 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1438,6 +1438,8 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
data.icon = ICON_MOD_MASK; break;
case ID_MC:
data.icon = ICON_SEQUENCE; break;
+ case ID_PC:
+ data.icon = ICON_CURVE_BEZCURVE; break;
default:
break;
}
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 0e215c595c1..0851d5ce9f4 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -86,7 +86,7 @@ typedef struct TreeElementIcon {
(ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB, ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \
ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS, ID_LP) || \
/* Only in 'blendfile' mode ... :/ */ \
- ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS, ID_MSK))
+ ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_MC, ID_WS, ID_MSK, ID_PC))
/* TreeElement->flag */
enum {
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index 3d79a15a5a0..822f9ec61ac 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -224,6 +224,11 @@ static void outliner_main_region_listener(
ED_region_tag_redraw(ar);
}
break;
+ case NC_PAINTCURVE:
+ if (ELEM(wmn->action, NA_ADDED)) {
+ ED_region_tag_redraw(ar);
+ }
+ break;
}
}