forked from bartvdbraak/blender
replace RNA_ID_type_name() with BKE_idcode_to_name_plural()
This commit is contained in:
parent
634be5992d
commit
df6b0af04a
@ -69,6 +69,7 @@
|
|||||||
#include "BKE_library.h"
|
#include "BKE_library.h"
|
||||||
#include "BKE_modifier.h"
|
#include "BKE_modifier.h"
|
||||||
#include "BKE_sequencer.h"
|
#include "BKE_sequencer.h"
|
||||||
|
#include "BKE_idcode.h"
|
||||||
|
|
||||||
#include "ED_armature.h"
|
#include "ED_armature.h"
|
||||||
#include "ED_screen.h"
|
#include "ED_screen.h"
|
||||||
@ -1598,7 +1599,10 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
|
|||||||
ten = outliner_add_element(soops, &soops->tree, (void *)lbarray[a], NULL, TSE_ID_BASE, 0);
|
ten = outliner_add_element(soops, &soops->tree, (void *)lbarray[a], NULL, TSE_ID_BASE, 0);
|
||||||
ten->directdata = lbarray[a];
|
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) {
|
for (; id; id = id->next) {
|
||||||
outliner_add_element(soops, &ten->subtree, id, ten, 0, 0);
|
outliner_add_element(soops, &ten->subtree, id, ten, 0, 0);
|
||||||
|
@ -1039,8 +1039,6 @@ int RNA_function_call_direct_va_lookup(struct bContext *C, struct ReportList *re
|
|||||||
short RNA_type_to_ID_code(StructRNA *type);
|
short RNA_type_to_ID_code(StructRNA *type);
|
||||||
StructRNA *ID_code_to_RNA_type(short idcode);
|
StructRNA *ID_code_to_RNA_type(short idcode);
|
||||||
|
|
||||||
const char *RNA_ID_type_name(short type);
|
|
||||||
|
|
||||||
|
|
||||||
#define RNA_POINTER_INVALIDATE(ptr) { \
|
#define RNA_POINTER_INVALIDATE(ptr) { \
|
||||||
/* this is checked for validity */ \
|
/* this is checked for validity */ \
|
||||||
|
@ -198,15 +198,6 @@ static Object *rna_Main_objects_new(Main *UNUSED(bmain), ReportList *reports, co
|
|||||||
return ob;
|
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)
|
static void rna_Main_objects_remove(Main *bmain, ReportList *reports, PointerRNA *object_ptr)
|
||||||
{
|
{
|
||||||
Object *object = object_ptr->data;
|
Object *object = object_ptr->data;
|
||||||
|
Loading…
Reference in New Issue
Block a user