[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25947] trunk/blender/source/blender/ editors/space_outliner/outliner.c: Fix [#20614] renaming certain things in outliner-> datablocks makes blender unresponsive to keystrokes

[Matt Ebb]

Revision: 25947
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25947
Author:   broken
Date:     2010-01-13 04:36:08 +0100 (Wed, 13 Jan 2010)

Log Message:
-----------
Fix [#20614] renaming certain things in outliner->datablocks makes blender unresponsive to keystrokes

Outliner isn't able to rename things in datablocks view, disabled it from the UI.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-01-13 03:21:55 UTC (rev 25946)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-01-13 03:36:08 UTC (rev 25947)
@@ -2494,8 +2494,11 @@
 		
 		/* name and first icon */
 		if(mval[0]>te->xs && mval[0]<te->xend) {
-
-			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)) 
+			
+			/* can't rename rna datablocks entries */
+			if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))
+			   ;
+			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)) 
 					error("Cannot edit builtin name");
 			else if(ELEM3(tselem->type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP))
 				error("Cannot edit sequence name");