[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57984] trunk/blender/source/blender/ editors/space_outliner: fix [#35998] Crash when trying rename Driver in Outliner
Campbell Barton
ideasman42 at gmail.com
Thu Jul 4 06:57:04 CEST 2013
Revision: 57984
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57984
Author: campbellbarton
Date: 2013-07-04 04:57:04 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
fix [#35998] Crash when trying rename Driver in Outliner
remove unused script define
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-07-04 03:56:18 UTC (rev 57983)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-07-04 04:57:04 UTC (rev 57984)
@@ -1252,8 +1252,6 @@
}
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:
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c 2013-07-04 03:56:18 UTC (rev 57983)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c 2013-07-04 04:57:04 UTC (rev 57984)
@@ -219,7 +219,7 @@
/* 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");
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_intern.h 2013-07-04 03:56:18 UTC (rev 57983)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_intern.h 2013-07-04 04:57:04 UTC (rev 57984)
@@ -77,7 +77,7 @@
#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
More information about the Bf-blender-cvs
mailing list