Commit: 9d6a1b990fed1624f49262d4d57227ed438efee8
Author: Bastien Montagne
Date: Wed Feb 27 16:36:29 2019 +0100
Branches: master
https://developer.blender.org/rB9d6a1b990fed1624f49262d4d57227ed438efee8
Revert "Fix broken 'search pointer' UI since this morning."
This reverts commit 456e3f00e007dbdeecb8a967ded9b7f4b2bc2969.
===================================================================
M source/blender/makesrna/intern/rna_main.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_main.c
b/source/blender/makesrna/intern/rna_main.c
index e3fe638082b..91b599a5ff1 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -300,239 +300,6 @@ static void
rna_Main_lightprobe_begin(CollectionPropertyIterator *iter, PointerR
rna_iterator_listbase_begin(iter, &bmain->lightprobe, NULL);
}
-static int rna_ID_lookup_string(ListBase *lb, const char *key, PointerRNA
*r_ptr)
-{
- ID *id;
- for (id = lb->first; id != NULL; id = id->next) {
- if (STREQ(id->name + 2, key)) {
- break;
- }
- else if (strstr(key, id->name + 2) != NULL) {
- char full_name_ui[MAX_ID_FULL_NAME_UI];
- BKE_id_full_name_ui_prefix_get(full_name_ui, id);
- /* Second check skips the three 'UI keycode letters'
prefix. */
- if (STREQ(full_name_ui, key) || STREQ(full_name_ui + 3,
key)) {
- break;
- }
- }
- }
- if (id != NULL) {
- RNA_id_pointer_create(id, r_ptr);
- return true;
- }
- return false;
-}
-
-int rna_Main_camera_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->camera, key, r_ptr);
-}
-
-int rna_Main_scene_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->scene, key, r_ptr);
-}
-
-int rna_Main_object_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->object, key, r_ptr);
-}
-
-int rna_Main_mat_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->mat, key, r_ptr);
-}
-
-int rna_Main_nodetree_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->nodetree, key, r_ptr);
-}
-
-int rna_Main_mesh_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->mesh, key, r_ptr);
-}
-
-int rna_Main_light_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->light, key, r_ptr);
-}
-
-int rna_Main_library_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->library, key, r_ptr);
-}
-
-int rna_Main_screen_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->screen, key, r_ptr);
-}
-
-int rna_Main_wm_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->wm, key, r_ptr);
-}
-
-int rna_Main_image_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->image, key, r_ptr);
-}
-
-int rna_Main_lattice_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->lattice, key, r_ptr);
-}
-
-int rna_Main_curve_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->curve, key, r_ptr);
-}
-
-int rna_Main_mball_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->mball, key, r_ptr);
-}
-
-int rna_Main_font_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->vfont, key, r_ptr);
-}
-
-int rna_Main_tex_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->tex, key, r_ptr);
-}
-
-int rna_Main_brush_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->brush, key, r_ptr);
-}
-
-int rna_Main_world_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->world, key, r_ptr);
-}
-
-int rna_Main_collection_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->collection, key, r_ptr);
-}
-
-int rna_Main_key_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->key, key, r_ptr);
-}
-
-int rna_Main_text_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->text, key, r_ptr);
-}
-
-int rna_Main_speaker_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->speaker, key, r_ptr);
-}
-
-int rna_Main_sound_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->sound, key, r_ptr);
-}
-
-int rna_Main_armature_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->armature, key, r_ptr);
-}
-
-int rna_Main_action_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->action, key, r_ptr);
-}
-
-int rna_Main_particle_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->particle, key, r_ptr);
-}
-
-int rna_Main_palette_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->palette, key, r_ptr);
-}
-
-int rna_Main_gpencil_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->gpencil, key, r_ptr);
-}
-
-int rna_Main_movieclip_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->movieclip, key, r_ptr);
-}
-
-int rna_Main_mask_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->mask, key, r_ptr);
-}
-
-int rna_Main_linestyle_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->linestyle, key, r_ptr);
-}
-
-int rna_Main_cachefile_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->cachefile, key, r_ptr);
-}
-
-int rna_Main_paintcurve_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->paintcurve, key, r_ptr);
-}
-
-int rna_Main_workspace_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->workspace, key, r_ptr);
-}
-
-int rna_Main_lightprobe_lookup_string(PointerRNA *ptr, const char *key, struct
PointerRNA *r_ptr)
-{
- Main *bmain = ptr->data;
- return rna_ID_lookup_string(&bmain->lightprobe, key, r_ptr);
-}
-
static void rna_Main_version_get(PointerRNA *ptr, int *value)
{
Main *bmain = (Main *)ptr->data;
@@ -565,7 +332,6 @@ typedef struct MainCollectionDef {
const char *name;
const char *description;
CollectionDefFunc *func;
- const char *lookup_string;
} MainCollectionDef;
void RNA_def_main(BlenderRNA *brna)
@@ -576,41 +342,41 @@ void RNA_def_main(BlenderRNA *brna)
/* plural must match idtypes in readblenentry.c */
MainCollectionDef lists[] = {
- {"cameras", "Camera", "rna_Main_camera_begin", "Cameras",
"Camera data-blocks", RNA_def_main_cameras, "rna_Main_camera_lookup_string"},
- {"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene
data-blocks", RNA_def_main_scenes, "rna_Main_scene_lookup_string"},
- {"objects", "Object", "rna_Main_object_begin", "Objects",
"Object data-blocks", RNA_def_main_objects, "rna_Main_object_lookup_string"},
- {"materials", "Material", "rna_Main_mat_begin", "Materials",
"Material data-blocks", RNA_def_main_materials, "rna_Main_mat_lookup_string"},
- {"node_groups", "NodeTree", "rna_Main_nodetree_begin", "Node
Groups", "Node group data-blocks", RNA_def_main_node_groups,
"rna_Main_nodetree_lookup_string"},
- {"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh
data-blocks", RNA_def_main_meshes, "rna_Main_mesh_lookup_string"},
- {"lights", "Light", "rna_Main_light_begin", "Lights", "Light
data-blocks", RNA_def_main_lights, "rna_Main_light_lookup_string"},
- {"libraries", "Library", "rna_Main_library_begin", "Libraries",
"Library data-blocks", RNA_def_main_libraries,
"rna_Main_library_lookup_string"},
- {"screens", "Screen", "rna_Main_screen_begin", "Screens",
"Screen data-blocks", RNA_def_main_screens, "rna_Main_screen_lookup_string"},
- {"window_managers", "WindowManager", "rna_Main_wm_begin",
"Window Managers", "Window manager data-blocks", RNA_def_main_window_managers,
"rna_Main_wm_lookup_string"},
- {"images", "Image", "rna_Main_image_begin", "Images", "Image
data-blocks", RNA_def_main_images, "rna_Main_image_lookup_string"},
- {"lattices", "Lattice", "rna_Main_lattice_begin", "Lattices",
"Lattice data-blocks", RNA_def_main_lattices, "rna_Main_lattice_lookup_string"},
- {"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve
data-blocks", RNA_def_main_curves, "rna_Main_curve_lookup_string"},
- {"metaballs", "MetaBall", "rna_Main_mball_begin", "Metaballs",
"Metaball data-blocks", RNA_def_main_metaballs, "rna_Main_mball_lookup_string"},
- {"fonts", "VectorFont", "rna_Main_font_begin", "Vector Fonts",
"Vector font data-blocks", RNA_def_main_fonts, "rna_Main_font_lookup_string"},
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
