diff options
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_armature.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_key.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_lattice.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_main.c | 196 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 68 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_meta.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm_gizmo.c | 2 |
15 files changed, 149 insertions, 149 deletions
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 90f93030cb9..1c16abcd12f 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -141,7 +141,7 @@ static void rna_Armature_update_layers(Main *bmain, Scene *UNUSED(scene), Pointe /* proxy lib exception, store it here so we can restore layers on file * load, since it would otherwise get lost due to being linked data */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->data == arm && ob->pose) ob->pose->proxy_layer = arm->layer; } @@ -426,7 +426,7 @@ static void rna_Bone_bbone_handle_update(Main *bmain, Scene *scene, PointerRNA * Bone *bone = (Bone *)ptr->data; /* Update all users of this armature after changing B-Bone handles. */ - for (Object *obt = bmain->object.first; obt; obt = obt->id.next) { + for (Object *obt = bmain->objects.first; obt; obt = obt->id.next) { if (obt->data == arm && obt->pose) { bPoseChannel *pchan = BKE_pose_channel_find_name(obt->pose, bone->name); diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index ed7d674e840..aba1f08ed6b 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -703,7 +703,7 @@ static void rna_BrushGpencilSettings_default_eraser_update(Main *bmain, Scene *s Brush *brush_cur = paint->brush; /* disable default eraser in all brushes */ - for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) { + for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) { if ((brush != brush_cur) && (brush->ob_mode == OB_MODE_PAINT_GPENCIL) && (brush->gpencil_tool == GPAINT_TOOL_ERASE)) diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index beda3ebb7b8..61c2600a021 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -424,7 +424,7 @@ static void rna_ColorManagedDisplaySettings_display_device_update(Main *bmain, S WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, NULL); /* Color management can be baked into shaders, need to refresh. */ - for (Material *ma = bmain->mat.first; ma; ma = ma->id.next) { + for (Material *ma = bmain->materials.first; ma; ma = ma->id.next) { DEG_id_tag_update(&ma->id, ID_RECALC_COPY_ON_WRITE); } } diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 80d6ca1ca15..8fe20a1b03f 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -655,7 +655,7 @@ static void rna_Key_update_data(Main *bmain, Scene *UNUSED(scene), PointerRNA *p Key *key = ptr->id.data; Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (BKE_key_from_object(ob) == key) { DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, ob); diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c index 304398953b6..410598082db 100644 --- a/source/blender/makesrna/intern/rna_lattice.c +++ b/source/blender/makesrna/intern/rna_lattice.c @@ -130,7 +130,7 @@ static void rna_Lattice_update_size(Main *bmain, Scene *scene, PointerRNA *ptr) neww = (lt->opntsw > 0) ? lt->opntsw : lt->pntsw; /* BKE_lattice_resize needs an object, any object will have the same result */ - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->data == lt) { BKE_lattice_resize(lt, newu, newv, neww, ob); if (lt->editlatt) diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index 91b599a5ff1..7bc0db3a725 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -90,166 +90,166 @@ static void rna_Main_filepath_set(PointerRNA *ptr, const char *value) } #endif -static void rna_Main_scene_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_scenes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->scene, NULL); + rna_iterator_listbase_begin(iter, &bmain->scenes, NULL); } -static void rna_Main_object_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_objects_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->object, NULL); + rna_iterator_listbase_begin(iter, &bmain->objects, NULL); } -static void rna_Main_light_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_lights_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->light, NULL); + rna_iterator_listbase_begin(iter, &bmain->lights, NULL); } -static void rna_Main_library_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_libraries_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->library, NULL); + rna_iterator_listbase_begin(iter, &bmain->libraries, NULL); } -static void rna_Main_mesh_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_meshes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->mesh, NULL); + rna_iterator_listbase_begin(iter, &bmain->meshes, NULL); } -static void rna_Main_curve_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_curves_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->curve, NULL); + rna_iterator_listbase_begin(iter, &bmain->curves, NULL); } -static void rna_Main_mball_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_metaballs_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->mball, NULL); + rna_iterator_listbase_begin(iter, &bmain->metaballs, NULL); } -static void rna_Main_mat_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_materials_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->mat, NULL); + rna_iterator_listbase_begin(iter, &bmain->materials, NULL); } -static void rna_Main_tex_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_textures_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->tex, NULL); + rna_iterator_listbase_begin(iter, &bmain->textures, NULL); } -static void rna_Main_image_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_images_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->image, NULL); + rna_iterator_listbase_begin(iter, &bmain->images, NULL); } -static void rna_Main_lattice_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_lattices_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->lattice, NULL); + rna_iterator_listbase_begin(iter, &bmain->lattices, NULL); } -static void rna_Main_camera_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_cameras_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->camera, NULL); + rna_iterator_listbase_begin(iter, &bmain->cameras, NULL); } -static void rna_Main_key_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_shapekeys_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->key, NULL); + rna_iterator_listbase_begin(iter, &bmain->shapekeys, NULL); } -static void rna_Main_world_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_worlds_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->world, NULL); + rna_iterator_listbase_begin(iter, &bmain->worlds, NULL); } -static void rna_Main_screen_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_screens_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->screen, NULL); + rna_iterator_listbase_begin(iter, &bmain->screens, NULL); } -static void rna_Main_font_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_fonts_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->vfont, NULL); + rna_iterator_listbase_begin(iter, &bmain->fonts, NULL); } -static void rna_Main_text_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_texts_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->text, NULL); + rna_iterator_listbase_begin(iter, &bmain->texts, NULL); } -static void rna_Main_speaker_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_speakers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->speaker, NULL); + rna_iterator_listbase_begin(iter, &bmain->speakers, NULL); } -static void rna_Main_sound_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_sounds_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->sound, NULL); + rna_iterator_listbase_begin(iter, &bmain->sounds, NULL); } -static void rna_Main_collection_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_collections_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->collection, NULL); + rna_iterator_listbase_begin(iter, &bmain->collections, NULL); } -static void rna_Main_armature_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_armatures_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->armature, NULL); + rna_iterator_listbase_begin(iter, &bmain->armatures, NULL); } -static void rna_Main_action_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_actions_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->action, NULL); + rna_iterator_listbase_begin(iter, &bmain->actions, NULL); } -static void rna_Main_nodetree_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_nodetrees_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->nodetree, NULL); + rna_iterator_listbase_begin(iter, &bmain->nodetrees, NULL); } -static void rna_Main_brush_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_brushes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->brush, NULL); + rna_iterator_listbase_begin(iter, &bmain->brushes, NULL); } -static void rna_Main_particle_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_particles_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->particle, NULL); + rna_iterator_listbase_begin(iter, &bmain->particles, NULL); } -static void rna_Main_palette_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_palettes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->palette, NULL); + rna_iterator_listbase_begin(iter, &bmain->palettes, NULL); } -static void rna_Main_gpencil_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_gpencils_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->gpencil, NULL); + rna_iterator_listbase_begin(iter, &bmain->gpencils, NULL); } static void rna_Main_wm_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) @@ -261,43 +261,43 @@ static void rna_Main_wm_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) static void rna_Main_movieclips_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->movieclip, NULL); + rna_iterator_listbase_begin(iter, &bmain->movieclips, NULL); } static void rna_Main_masks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->mask, NULL); + rna_iterator_listbase_begin(iter, &bmain->masks, NULL); } -static void rna_Main_linestyle_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_linestyles_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->linestyle, NULL); + rna_iterator_listbase_begin(iter, &bmain->linestyles, NULL); } -static void rna_Main_cachefile_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_cachefiles_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->cachefile, NULL); + rna_iterator_listbase_begin(iter, &bmain->cachefiles, NULL); } -static void rna_Main_paintcurve_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_paintcurves_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->paintcurve, NULL); + rna_iterator_listbase_begin(iter, &bmain->paintcurves, NULL); } -static void rna_Main_workspace_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_workspaces_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->workspace, NULL); + rna_iterator_listbase_begin(iter, &bmain->workspaces, NULL); } -static void rna_Main_lightprobe_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) +static void rna_Main_lightprobes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { Main *bmain = (Main *)ptr->data; - rna_iterator_listbase_begin(iter, &bmain->lightprobe, NULL); + rna_iterator_listbase_begin(iter, &bmain->lightprobes, NULL); } static void rna_Main_version_get(PointerRNA *ptr, int *value) @@ -342,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}, - {"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene data-blocks", RNA_def_main_scenes}, - {"objects", "Object", "rna_Main_object_begin", "Objects", "Object data-blocks", RNA_def_main_objects}, - {"materials", "Material", "rna_Main_mat_begin", "Materials", "Material data-blocks", RNA_def_main_materials}, - {"node_groups", "NodeTree", "rna_Main_nodetree_begin", "Node Groups", "Node group data-blocks", RNA_def_main_node_groups}, - {"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh data-blocks", RNA_def_main_meshes}, - {"lights", "Light", "rna_Main_light_begin", "Lights", "Light data-blocks", RNA_def_main_lights}, - {"libraries", "Library", "rna_Main_library_begin", "Libraries", "Library data-blocks", RNA_def_main_libraries}, - {"screens", "Screen", "rna_Main_screen_begin", "Screens", "Screen data-blocks", RNA_def_main_screens}, + {"cameras", "Camera", "rna_Main_cameras_begin", "Cameras", "Camera data-blocks", RNA_def_main_cameras}, + {"scenes", "Scene", "rna_Main_scenes_begin", "Scenes", "Scene data-blocks", RNA_def_main_scenes}, + {"objects", "Object", "rna_Main_objects_begin", "Objects", "Object data-blocks", RNA_def_main_objects}, + {"materials", "Material", "rna_Main_materials_begin", "Materials", "Material data-blocks", RNA_def_main_materials}, + {"node_groups", "NodeTree", "rna_Main_nodetrees_begin", "Node Groups", "Node group data-blocks", RNA_def_main_node_groups}, + {"meshes", "Mesh", "rna_Main_meshes_begin", "Meshes", "Mesh data-blocks", RNA_def_main_meshes}, + {"lights", "Light", "rna_Main_lights_begin", "Lights", "Light data-blocks", RNA_def_main_lights}, + {"libraries", "Library", "rna_Main_libraries_begin", "Libraries", "Library data-blocks", RNA_def_main_libraries}, + {"screens", "Screen", "rna_Main_screens_begin", "Screens", "Screen data-blocks", RNA_def_main_screens}, {"window_managers", "WindowManager", "rna_Main_wm_begin", "Window Managers", "Window manager data-blocks", RNA_def_main_window_managers}, - {"images", "Image", "rna_Main_image_begin", "Images", "Image data-blocks", RNA_def_main_images}, - {"lattices", "Lattice", "rna_Main_lattice_begin", "Lattices", "Lattice data-blocks", RNA_def_main_lattices}, - {"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve data-blocks", RNA_def_main_curves}, - {"metaballs", "MetaBall", "rna_Main_mball_begin", "Metaballs", "Metaball data-blocks", RNA_def_main_metaballs}, - {"fonts", "VectorFont", "rna_Main_font_begin", "Vector Fonts", "Vector font data-blocks", RNA_def_main_fonts}, - {"textures", "Texture", "rna_Main_tex_begin", "Textures", "Texture data-blocks", RNA_def_main_textures}, - {"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush data-blocks", RNA_def_main_brushes}, - {"worlds", "World", "rna_Main_world_begin", "Worlds", "World data-blocks", RNA_def_main_worlds}, - {"collections", "Collection", "rna_Main_collection_begin", "Collections", "Collection data-blocks", RNA_def_main_collections}, - {"shape_keys", "Key", "rna_Main_key_begin", "Shape Keys", "Shape Key data-blocks", NULL}, - {"texts", "Text", "rna_Main_text_begin", "Texts", "Text data-blocks", RNA_def_main_texts}, - {"speakers", "Speaker", "rna_Main_speaker_begin", "Speakers", "Speaker data-blocks", RNA_def_main_speakers}, - {"sounds", "Sound", "rna_Main_sound_begin", "Sounds", "Sound data-blocks", RNA_def_main_sounds}, - {"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature data-blocks", RNA_def_main_armatures}, - {"actions", "Action", "rna_Main_action_begin", "Actions", "Action data-blocks", RNA_def_main_actions}, - {"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle data-blocks", RNA_def_main_particles}, - {"palettes", "Palette", "rna_Main_palette_begin", "Palettes", "Palette data-blocks", RNA_def_main_palettes}, - {"grease_pencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil data-blocks", RNA_def_main_gpencil}, + {"images", "Image", "rna_Main_images_begin", "Images", "Image data-blocks", RNA_def_main_images}, + {"lattices", "Lattice", "rna_Main_lattices_begin", "Lattices", "Lattice data-blocks", RNA_def_main_lattices}, + {"curves", "Curve", "rna_Main_curves_begin", "Curves", "Curve data-blocks", RNA_def_main_curves}, + {"metaballs", "MetaBall", "rna_Main_metaballs_begin", "Metaballs", "Metaball data-blocks", RNA_def_main_metaballs}, + {"fonts", "VectorFont", "rna_Main_fonts_begin", "Vector Fonts", "Vector font data-blocks", RNA_def_main_fonts}, + {"textures", "Texture", "rna_Main_textures_begin", "Textures", "Texture data-blocks", RNA_def_main_textures}, + {"brushes", "Brush", "rna_Main_brushes_begin", "Brushes", "Brush data-blocks", RNA_def_main_brushes}, + {"worlds", "World", "rna_Main_worlds_begin", "Worlds", "World data-blocks", RNA_def_main_worlds}, + {"collections", "Collection", "rna_Main_collections_begin", "Collections", "Collection data-blocks", RNA_def_main_collections}, + {"shape_keys", "Key", "rna_Main_shapekeys_begin", "Shape Keys", "Shape Key data-blocks", NULL}, + {"texts", "Text", "rna_Main_texts_begin", "Texts", "Text data-blocks", RNA_def_main_texts}, + {"speakers", "Speaker", "rna_Main_speakers_begin", "Speakers", "Speaker data-blocks", RNA_def_main_speakers}, + {"sounds", "Sound", "rna_Main_sounds_begin", "Sounds", "Sound data-blocks", RNA_def_main_sounds}, + {"armatures", "Armature", "rna_Main_armatures_begin", "Armatures", "Armature data-blocks", RNA_def_main_armatures}, + {"actions", "Action", "rna_Main_actions_begin", "Actions", "Action data-blocks", RNA_def_main_actions}, + {"particles", "ParticleSettings", "rna_Main_particles_begin", "Particles", "Particle data-blocks", RNA_def_main_particles}, + {"palettes", "Palette", "rna_Main_palettes_begin", "Palettes", "Palette data-blocks", RNA_def_main_palettes}, + {"grease_pencil", "GreasePencil", "rna_Main_gpencils_begin", "Grease Pencil", "Grease Pencil data-blocks", RNA_def_main_gpencil}, {"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip data-blocks", RNA_def_main_movieclips}, {"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks data-blocks", RNA_def_main_masks}, - {"linestyles", "FreestyleLineStyle", "rna_Main_linestyle_begin", "Line Styles", "Line Style data-blocks", RNA_def_main_linestyles}, - {"cache_files", "CacheFile", "rna_Main_cachefile_begin", "Cache Files", "Cache Files data-blocks", RNA_def_main_cachefiles}, - {"paint_curves", "PaintCurve", "rna_Main_paintcurve_begin", "Paint Curves", "Paint Curves data-blocks", RNA_def_main_paintcurves}, - {"workspaces", "WorkSpace", "rna_Main_workspace_begin", "Workspaces", "Workspace data-blocks", RNA_def_main_workspaces}, - {"lightprobes", "LightProbe", "rna_Main_lightprobe_begin", "LightProbes", "LightProbe data-blocks", RNA_def_main_lightprobes}, + {"linestyles", "FreestyleLineStyle", "rna_Main_linestyles_begin", "Line Styles", "Line Style data-blocks", RNA_def_main_linestyles}, + {"cache_files", "CacheFile", "rna_Main_cachefiles_begin", "Cache Files", "Cache Files data-blocks", RNA_def_main_cachefiles}, + {"paint_curves", "PaintCurve", "rna_Main_paintcurves_begin", "Paint Curves", "Paint Curves data-blocks", RNA_def_main_paintcurves}, + {"workspaces", "WorkSpace", "rna_Main_workspaces_begin", "Workspaces", "Workspace data-blocks", RNA_def_main_workspaces}, + {"lightprobes", "LightProbe", "rna_Main_lightprobes_begin", "LightProbes", "LightProbe data-blocks", RNA_def_main_lightprobes}, {NULL, NULL, NULL, NULL, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 5675e00586c..34e759325d1 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -611,41 +611,41 @@ static LightProbe *rna_Main_lightprobe_new(Main *bmain, const char *name) BKE_main_id_tag_listbase(&bmain->_listbase_name, LIB_TAG_DOIT, value); \ } \ -RNA_MAIN_ID_TAG_FUNCS_DEF(cameras, camera, ID_CA) -RNA_MAIN_ID_TAG_FUNCS_DEF(scenes, scene, ID_SCE) -RNA_MAIN_ID_TAG_FUNCS_DEF(objects, object, ID_OB) -RNA_MAIN_ID_TAG_FUNCS_DEF(materials, mat, ID_MA) -RNA_MAIN_ID_TAG_FUNCS_DEF(node_groups, nodetree, ID_NT) -RNA_MAIN_ID_TAG_FUNCS_DEF(meshes, mesh, ID_ME) -RNA_MAIN_ID_TAG_FUNCS_DEF(lights, light, ID_LA) -RNA_MAIN_ID_TAG_FUNCS_DEF(libraries, library, ID_LI) -RNA_MAIN_ID_TAG_FUNCS_DEF(screens, screen, ID_SCR) +RNA_MAIN_ID_TAG_FUNCS_DEF(cameras, cameras, ID_CA) +RNA_MAIN_ID_TAG_FUNCS_DEF(scenes, scenes, ID_SCE) +RNA_MAIN_ID_TAG_FUNCS_DEF(objects, objects, ID_OB) +RNA_MAIN_ID_TAG_FUNCS_DEF(materials, materials, ID_MA) +RNA_MAIN_ID_TAG_FUNCS_DEF(node_groups, nodetrees, ID_NT) +RNA_MAIN_ID_TAG_FUNCS_DEF(meshes, meshes, ID_ME) +RNA_MAIN_ID_TAG_FUNCS_DEF(lights, lights, ID_LA) +RNA_MAIN_ID_TAG_FUNCS_DEF(libraries, libraries, ID_LI) +RNA_MAIN_ID_TAG_FUNCS_DEF(screens, screens, ID_SCR) RNA_MAIN_ID_TAG_FUNCS_DEF(window_managers, wm, ID_WM) -RNA_MAIN_ID_TAG_FUNCS_DEF(images, image, ID_IM) -RNA_MAIN_ID_TAG_FUNCS_DEF(lattices, lattice, ID_LT) -RNA_MAIN_ID_TAG_FUNCS_DEF(curves, curve, ID_CU) -RNA_MAIN_ID_TAG_FUNCS_DEF(metaballs, mball, ID_MB) -RNA_MAIN_ID_TAG_FUNCS_DEF(fonts, vfont, ID_VF) -RNA_MAIN_ID_TAG_FUNCS_DEF(textures, tex, ID_TE) -RNA_MAIN_ID_TAG_FUNCS_DEF(brushes, brush, ID_BR) -RNA_MAIN_ID_TAG_FUNCS_DEF(worlds, world, ID_WO) -RNA_MAIN_ID_TAG_FUNCS_DEF(collections, collection, ID_GR) +RNA_MAIN_ID_TAG_FUNCS_DEF(images, images, ID_IM) +RNA_MAIN_ID_TAG_FUNCS_DEF(lattices, lattices, ID_LT) +RNA_MAIN_ID_TAG_FUNCS_DEF(curves, curves, ID_CU) +RNA_MAIN_ID_TAG_FUNCS_DEF(metaballs, metaballs, ID_MB) +RNA_MAIN_ID_TAG_FUNCS_DEF(fonts, fonts, ID_VF) +RNA_MAIN_ID_TAG_FUNCS_DEF(textures, textures, ID_TE) +RNA_MAIN_ID_TAG_FUNCS_DEF(brushes, brushes, ID_BR) +RNA_MAIN_ID_TAG_FUNCS_DEF(worlds, worlds, ID_WO) +RNA_MAIN_ID_TAG_FUNCS_DEF(collections, collections, ID_GR) //RNA_MAIN_ID_TAG_FUNCS_DEF(shape_keys, key, ID_KE) -RNA_MAIN_ID_TAG_FUNCS_DEF(texts, text, ID_TXT) -RNA_MAIN_ID_TAG_FUNCS_DEF(speakers, speaker, ID_SPK) -RNA_MAIN_ID_TAG_FUNCS_DEF(sounds, sound, ID_SO) -RNA_MAIN_ID_TAG_FUNCS_DEF(armatures, armature, ID_AR) -RNA_MAIN_ID_TAG_FUNCS_DEF(actions, action, ID_AC) -RNA_MAIN_ID_TAG_FUNCS_DEF(particles, particle, ID_PA) -RNA_MAIN_ID_TAG_FUNCS_DEF(palettes, palette, ID_PAL) -RNA_MAIN_ID_TAG_FUNCS_DEF(gpencil, gpencil, ID_GD) -RNA_MAIN_ID_TAG_FUNCS_DEF(movieclips, movieclip, ID_MC) -RNA_MAIN_ID_TAG_FUNCS_DEF(masks, mask, ID_MSK) -RNA_MAIN_ID_TAG_FUNCS_DEF(linestyle, linestyle, ID_LS) -RNA_MAIN_ID_TAG_FUNCS_DEF(cachefiles, cachefile, ID_CF) -RNA_MAIN_ID_TAG_FUNCS_DEF(paintcurves, paintcurve, ID_PC) -RNA_MAIN_ID_TAG_FUNCS_DEF(workspaces, workspace, ID_WS) -RNA_MAIN_ID_TAG_FUNCS_DEF(lightprobes, lightprobe, ID_LP) +RNA_MAIN_ID_TAG_FUNCS_DEF(texts, texts, ID_TXT) +RNA_MAIN_ID_TAG_FUNCS_DEF(speakers, speakers, ID_SPK) +RNA_MAIN_ID_TAG_FUNCS_DEF(sounds, sounds, ID_SO) +RNA_MAIN_ID_TAG_FUNCS_DEF(armatures, armatures, ID_AR) +RNA_MAIN_ID_TAG_FUNCS_DEF(actions, actions, ID_AC) +RNA_MAIN_ID_TAG_FUNCS_DEF(particles, particles, ID_PA) +RNA_MAIN_ID_TAG_FUNCS_DEF(palettes, palettes, ID_PAL) +RNA_MAIN_ID_TAG_FUNCS_DEF(gpencils, gpencils, ID_GD) +RNA_MAIN_ID_TAG_FUNCS_DEF(movieclips, movieclips, ID_MC) +RNA_MAIN_ID_TAG_FUNCS_DEF(masks, masks, ID_MSK) +RNA_MAIN_ID_TAG_FUNCS_DEF(linestyle, linestyles, ID_LS) +RNA_MAIN_ID_TAG_FUNCS_DEF(cachefiles, cachefiles, ID_CF) +RNA_MAIN_ID_TAG_FUNCS_DEF(paintcurves, paintcurves, ID_PC) +RNA_MAIN_ID_TAG_FUNCS_DEF(workspaces, workspaces, ID_WS) +RNA_MAIN_ID_TAG_FUNCS_DEF(lightprobes, lightprobes, ID_LP) #undef RNA_MAIN_ID_TAG_FUNCS_DEF @@ -1661,7 +1661,7 @@ void RNA_def_main_gpencil(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_struct_sdna(srna, "Main"); RNA_def_struct_ui_text(srna, "Main Grease Pencils", "Collection of grease pencils"); - func = RNA_def_function(srna, "tag", "rna_Main_gpencil_tag"); + func = RNA_def_function(srna, "tag", "rna_Main_gpencils_tag"); parm = RNA_def_boolean(func, "value", 0, "Value", ""); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 1b21e554223..4c400b4fb2e 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -157,7 +157,7 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *U if (ma->texpaintslot) { Image *image = ma->texpaintslot[ma->paint_active_slot].ima; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { wmWindow *win = ED_screen_window_find(sc, bmain->wm.first); if (win == NULL) { continue; diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index 246a9c4beb5..0f4cd4759bc 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -95,7 +95,7 @@ static void rna_MetaBall_update_data(Main *bmain, Scene *scene, PointerRNA *ptr) /* cheating way for importers to avoid slow updates */ if (mb->id.us > 0) { - for (ob = bmain->object.first; ob; ob = ob->id.next) + for (ob = bmain->objects.first; ob; ob = ob->id.next) if (ob->data == mb) BKE_mball_properties_copy(scene, ob); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 6af131fd857..4e1a539fe69 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -625,7 +625,7 @@ static void rna_Particle_change_type(Main *bmain, Scene *UNUSED(scene), PointerR ParticleSettings *part = ptr->id.data; /* Iterating over all object is slow, but no better solution exists at the moment. */ - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) { if (psys->part == part) { psys_changed_type(ob, psys); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 8a444002e29..6aec918f7f9 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1546,7 +1546,7 @@ static void rna_Scene_use_simplify_update(Main *bmain, Scene *UNUSED(scene), Poi Scene *sce_iter; Base *base; - BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); + BKE_main_id_tag_listbase(&bmain->objects, LIB_TAG_DOIT, true); FOREACH_SCENE_OBJECT_BEGIN(sce, ob) { object_simplify_update(ob); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 00d42fc408b..f372180dd3b 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -481,7 +481,7 @@ static void rna_ImaPaint_canvas_update(bContext *C, PointerRNA *UNUSED(ptr)) bScreen *sc; Image *ima = scene->toolsettings->imapaint.canvas; - for (sc = bmain->screen.first; sc; sc = sc->id.next) { + for (sc = bmain->screens.first; sc; sc = sc->id.next) { ScrArea *sa; for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *slink; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index fd9c45034c3..0592a524b76 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -505,7 +505,7 @@ static void rna_Space_view2d_sync_update(Main *UNUSED(bmain), Scene *UNUSED(scen static void rna_GPencil_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) { /* need set all caches as dirty to recalculate onion skinning */ - for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->type == OB_GPENCIL) { DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); } @@ -650,7 +650,7 @@ static void rna_3DViewShading_type_update(Main *bmain, Scene *UNUSED(scene), Poi return; } - for (Material *ma = bmain->mat.first; ma; ma = ma->id.next) { + for (Material *ma = bmain->materials.first; ma; ma = ma->id.next) { /* XXX Dependency graph does not support CD mask tracking, * so we trigger materials shading for until it's properly supported. * This is to ensure material batches are all recreated when switching diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 72f46ee10c7..dda36d89eb1 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -167,7 +167,7 @@ static void rna_userdef_update_ui(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi static void rna_userdef_update_ui_header_default(Main *bmain, Scene *scene, PointerRNA *ptr) { if (U.uiflag & USER_HEADER_FROM_PREF) { - for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { BKE_screen_header_alignment_reset(screen); } rna_userdef_update_ui(bmain, scene, ptr); @@ -336,7 +336,7 @@ static void rna_UserDef_weight_color_update(Main *bmain, Scene *scene, PointerRN { Object *ob; - for (ob = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->objects.first; ob; ob = ob->id.next) { if (ob->mode & OB_MODE_WEIGHT_PAINT) DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); } @@ -478,7 +478,7 @@ static void rna_userdef_opensubdiv_update(Main *bmain, Scene *UNUSED(scene), Poi { Object *object; - for (object = bmain->object.first; + for (object = bmain->objects.first; object; object = object->id.next) { diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index 3f0e7cfb32a..2a084cbd526 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -257,7 +257,7 @@ static wmGizmo *rna_GizmoProperties_find_operator(PointerRNA *ptr) #endif /* We could try workaruond this lookup, but not trivial. */ - for (bScreen *screen = G_MAIN->screen.first; screen; screen = screen->id.next) { + for (bScreen *screen = G_MAIN->screens.first; screen; screen = screen->id.next) { IDProperty *properties = ptr->data; for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) { |