From 32e674c2c91378d9e1875f936bfffa796d7178be Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Jul 2013 04:57:04 +0000 Subject: fix [#35998] Crash when trying rename Driver in Outliner remove unused script define --- source/blender/editors/space_outliner/outliner_draw.c | 2 -- source/blender/editors/space_outliner/outliner_edit.c | 2 +- source/blender/editors/space_outliner/outliner_intern.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 3b769761dfb..cfcc4641afd 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1252,8 +1252,6 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto } break; } - case TSE_SCRIPT_BASE: - UI_icon_draw(x, y, ICON_TEXT); break; case TSE_POSE_BASE: UI_icon_draw(x, y, ICON_ARMATURE_DATA); break; case TSE_POSE_CHANNEL: diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 0a1d3a63f2c..2f97108c5ee 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -219,7 +219,7 @@ static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem, /* do nothing */; } else if (ELEM10(tselem->type, TSE_ANIM_DATA, TSE_NLA, TSE_DEFGROUP_BASE, TSE_CONSTRAINT_BASE, TSE_MODIFIER_BASE, - TSE_SCRIPT_BASE, TSE_POSE_BASE, TSE_POSEGRP_BASE, TSE_R_LAYER_BASE, TSE_R_PASS)) + TSE_DRIVER_BASE, TSE_POSE_BASE, TSE_POSEGRP_BASE, TSE_R_LAYER_BASE, TSE_R_PASS)) { BKE_report(reports, RPT_WARNING, "Cannot edit builtin name"); } diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 3ab412f0ddc..fe07a7dae9f 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -77,7 +77,7 @@ typedef struct TreeElement { #define TSE_MODIFIER_BASE 9 #define TSE_MODIFIER 10 #define TSE_LINKED_OB 11 -#define TSE_SCRIPT_BASE 12 +// #define TSE_SCRIPT_BASE 12 // UNUSED #define TSE_POSE_BASE 13 #define TSE_POSE_CHANNEL 14 #define TSE_ANIM_DATA 15 -- cgit v1.2.3