[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53268] trunk/blender/source/blender: replace RNA_ID_type_name() with BKE_idcode_to_name_plural()

[Campbell Barton]

Revision: 53268
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53268
Author:   campbellbarton
Date:     2012-12-22 14:04:09 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
replace RNA_ID_type_name() with BKE_idcode_to_name_plural()

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
    trunk/blender/source/blender/makesrna/RNA_access.h
    trunk/blender/source/blender/makesrna/intern/rna_main_api.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c 
2012-12-22 13:42:06 UTC (rev 53267)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c 
2012-12-22 14:04:09 UTC (rev 53268)
@@ -69,6 +69,7 @@
 #include "BKE_library.h"
 #include "BKE_modifier.h"
 #include "BKE_sequencer.h"
+#include "BKE_idcode.h"
 
 #include "ED_armature.h"
 #include "ED_screen.h"
@@ -1598,7 +1599,10 @@
                                ten = outliner_add_element(soops, &soops->tree, 
(void *)lbarray[a], NULL, TSE_ID_BASE, 0);
                                ten->directdata = lbarray[a];
                                
-                               ten->name = (char 
*)RNA_ID_type_name(GS(id->name));
+                               ten->name = (char 
*)BKE_idcode_to_name_plural(GS(id->name));
+                               if (UNLIKELY(ten->name == NULL)) {
+                                       ten->name = "UNKNOWN";
+                               }
                                
                                for (; id; id = id->next) {
                                        outliner_add_element(soops, 
&ten->subtree, id, ten, 0, 0);

Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h  2012-12-22 13:42:06 UTC 
(rev 53267)
+++ trunk/blender/source/blender/makesrna/RNA_access.h  2012-12-22 14:04:09 UTC 
(rev 53268)
@@ -1039,9 +1039,7 @@
 short RNA_type_to_ID_code(StructRNA *type);
 StructRNA *ID_code_to_RNA_type(short idcode);
 
-const char *RNA_ID_type_name(short type);
 
-
 #define RNA_POINTER_INVALIDATE(ptr) {                                         \
        /* this is checked for validity */                                      
  \
        (ptr)->type =                                                           
  \

Modified: trunk/blender/source/blender/makesrna/intern/rna_main_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_main_api.c 2012-12-22 
13:42:06 UTC (rev 53267)
+++ trunk/blender/source/blender/makesrna/intern/rna_main_api.c 2012-12-22 
14:04:09 UTC (rev 53268)
@@ -198,15 +198,6 @@
        return ob;
 }
 
-/* exported for non-rna use cases */
-const char *RNA_ID_type_name(short type)
-{
-       const char *idname;
-       if (RNA_enum_id_from_value(id_type_items, type, &idname) == 0)
-               idname = "UNKNOWN";
-       return idname;
-}
-
 static void rna_Main_objects_remove(Main *bmain, ReportList *reports, 
PointerRNA *object_ptr)
 {
        Object *object = object_ptr->data;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs