diff options
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 16 | ||||
| -rw-r--r-- | source/blender/editors/space_time/space_time.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_outliner_types.h | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/WM_types.h | 2 |
6 files changed, 2 insertions, 22 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index eb3e300443d..794195e980e 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1074,8 +1074,6 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto UI_icon_draw(x, y, ICON_MODIFIER); break; case TSE_LINKED_OB: UI_icon_draw(x, y, ICON_OBJECT_DATA); break; - case TSE_LINKED_PSYS: - UI_icon_draw(x, y, ICON_PARTICLES); break; case TSE_MODIFIER: { Object *ob = (Object *)tselem->id; diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 84f8c629c5d..cda9de92a82 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -664,20 +664,6 @@ static eOLDrawState tree_element_active_modifier( return OL_DRAWSEL_NONE; } -static eOLDrawState tree_element_active_psys( - bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) -{ - if (set != OL_SETSEL_NONE) { - Object *ob = (Object *)tselem->id; - - WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_EDITED, ob); - -// XXX extern_set_butspace(F7KEY, 0); - } - - return OL_DRAWSEL_NONE; -} - static int tree_element_active_constraint( bContext *C, TreeElement *UNUSED(te), TreeStoreElem *tselem, const eOLSetState set) { @@ -856,8 +842,6 @@ eOLDrawState tree_element_type_active( return OL_DRAWSEL_NORMAL; } break; - case TSE_LINKED_PSYS: - return tree_element_active_psys(C, scene, te, tselem, set); case TSE_POSE_BASE: return tree_element_active_pose(C, scene, te, tselem, set); case TSE_POSE_CHANNEL: diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index d28f6e1f3e2..9872ffad043 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -424,7 +424,6 @@ static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn) case ND_BONE_ACTIVE: case ND_POINTCACHE: case ND_MODIFIER: - case ND_PARTICLE: case ND_KEYS: ED_area_tag_refresh(sa); ED_area_tag_redraw(sa); diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index fa14ca96fe2..43d0a31af71 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -868,7 +868,6 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w case ND_MODIFIER: case ND_CONSTRAINT: case ND_KEYS: - case ND_PARTICLE: case ND_LOD: ED_region_tag_redraw(ar); break; diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index 984e3334414..51bd30cdf14 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -87,7 +87,7 @@ typedef struct TreeStore { #define TSE_SEQUENCE 26 /* NO ID */ #define TSE_SEQ_STRIP 27 /* NO ID */ #define TSE_SEQUENCE_DUP 28 /* NO ID */ -#define TSE_LINKED_PSYS 29 +/* #define TSE_LINKED_PSYS 29 */ /* DEPRECATED */ #define TSE_RNA_STRUCT 30 /* NO ID */ #define TSE_RNA_PROPERTY 31 /* NO ID */ #define TSE_RNA_ARRAY_ELEM 32 /* NO ID */ diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 3c0e99bddd0..1ab530fe66b 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -298,7 +298,7 @@ typedef struct wmNotifier { #define ND_MODIFIER (24<<16) #define ND_KEYS (25<<16) #define ND_CONSTRAINT (26<<16) -#define ND_PARTICLE (27<<16) +/*#define ND_PARTICLE (27<<16)*/ /* DEPRECATED */ #define ND_POINTCACHE (28<<16) #define ND_PARENT (29<<16) #define ND_LOD (30<<16) |