blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: Main struct member names 

Rename latt to lattice and don't use plural names.
This commit is contained in:
Campbell Barton 2019-02-27 11:14:41 +11:00
parent 3051e2f4ae
commit 918941483f
Notes: blender-bot 2023-04-19 22:54:54 +02:00 
Referenced by commit 8f817de0cb, Cleanup: use plural names for Main lists
19 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/BKE_main.h
View File

@ -93,7 +93,7 @@ typedef struct Main {
ListBase mat;
ListBase tex;
ListBase image;
ListBase latt;
ListBase lattice;
ListBase light;
ListBase camera;
ListBase ipo; // XXX deprecated
@ -111,15 +111,15 @@ typedef struct Main {
ListBase nodetree;
ListBase brush;
ListBase particle;
ListBase palettes;
ListBase paintcurves;
ListBase palette;
ListBase paintcurve;
ListBase wm;
ListBase gpencil;
ListBase movieclip;
ListBase mask;
ListBase linestyle;
ListBase cachefiles;
ListBase workspaces;
ListBase cachefile;
ListBase workspace;
/* Must be generated, used and freed by same code - never assume this is valid data unless you know
* when, who and how it was created.

16
source/blender/blenkernel/intern/anim_sys.c
View File

@ -1153,7 +1153,7 @@ void BKE_animdata_main_cb(Main *bmain, ID_AnimData_Edit_Callback func, void *use
ANIMDATA_IDS_CB(bmain->armature.first);
/* lattices */
ANIMDATA_IDS_CB(bmain->latt.first);
ANIMDATA_IDS_CB(bmain->lattice.first);
/* meshes */
ANIMDATA_IDS_CB(bmain->mesh.first);
@ -1186,10 +1186,10 @@ void BKE_animdata_main_cb(Main *bmain, ID_AnimData_Edit_Callback func, void *use
ANIMDATA_IDS_CB(bmain->gpencil.first);
/* palettes */
ANIMDATA_IDS_CB(bmain->palettes.first);
ANIMDATA_IDS_CB(bmain->palette.first);
/* cache files */
ANIMDATA_IDS_CB(bmain->cachefiles.first);
ANIMDATA_IDS_CB(bmain->cachefile.first);
}
/* Fix all RNA-Paths throughout the database (directly access the Global.main version)
@ -1252,7 +1252,7 @@ void BKE_animdata_fix_paths_rename_all(ID *ref_id, const char *prefix, const cha
RENAMEFIX_ANIM_IDS(bmain->armature.first);
/* lattices */
RENAMEFIX_ANIM_IDS(bmain->latt.first);
RENAMEFIX_ANIM_IDS(bmain->lattice.first);
/* meshes */
RENAMEFIX_ANIM_IDS(bmain->mesh.first);
@ -1282,7 +1282,7 @@ void BKE_animdata_fix_paths_rename_all(ID *ref_id, const char *prefix, const cha
RENAMEFIX_ANIM_IDS(bmain->gpencil.first);
/* cache files */
RENAMEFIX_ANIM_IDS(bmain->cachefiles.first);
RENAMEFIX_ANIM_IDS(bmain->cachefile.first);
/* scenes */
RENAMEFIX_ANIM_NODETREE_IDS(bmain->scene.first, Scene);
@ -3634,7 +3634,7 @@ void BKE_animsys_evaluate_all_animation(Main *main, Depsgraph *depsgraph, Scene
EVAL_ANIM_IDS(main->armature.first, ADT_RECALC_ANIM);
/* lattices */
EVAL_ANIM_IDS(main->latt.first, ADT_RECALC_ANIM);
EVAL_ANIM_IDS(main->lattice.first, ADT_RECALC_ANIM);
/* meshes */
EVAL_ANIM_IDS(main->mesh.first, ADT_RECALC_ANIM);
@ -3655,10 +3655,10 @@ void BKE_animsys_evaluate_all_animation(Main *main, Depsgraph *depsgraph, Scene
EVAL_ANIM_IDS(main->gpencil.first, ADT_RECALC_ANIM);
/* palettes */
EVAL_ANIM_IDS(main->palettes.first, ADT_RECALC_ANIM);
EVAL_ANIM_IDS(main->palette.first, ADT_RECALC_ANIM);
/* cache files */
EVAL_ANIM_IDS(main->cachefiles.first, ADT_RECALC_ANIM);
EVAL_ANIM_IDS(main->cachefile.first, ADT_RECALC_ANIM);
/* objects */
/* ADT_RECALC_ANIM doesn't need to be supplied here, since object AnimData gets

6
source/blender/blenkernel/intern/blendfile.c
View File

@ -170,7 +170,7 @@ static void setup_app_data(
/* comes from readfile.c */
SWAP(ListBase, bmain->wm, bfd->main->wm);
SWAP(ListBase, bmain->workspaces, bfd->main->workspaces);
SWAP(ListBase, bmain->workspace, bfd->main->workspace);
SWAP(ListBase, bmain->screen, bfd->main->screen);
/* we re-use current window and screen */
@ -573,7 +573,7 @@ WorkspaceConfigFileData *BKE_blendfile_workspace_config_read(const char *filepat
if (bfd) {
workspace_config = MEM_mallocN(sizeof(*workspace_config), __func__);
workspace_config->main = bfd->main;
workspace_config->workspaces = bfd->main->workspaces;
workspace_config->workspaces = bfd->main->workspace;
MEM_freeN(bfd);
}
@ -588,7 +588,7 @@ bool BKE_blendfile_workspace_config_write(Main *bmain, const char *filepath, Rep
BKE_blendfile_write_partial_begin(bmain);
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
BKE_blendfile_write_partial_tag_ID(&workspace->id, true);
}

2
source/blender/blenkernel/intern/cachefile.c
View File

@ -177,7 +177,7 @@ void BKE_cachefile_update_frame(
CacheFile *cache_file;
char filename[FILE_MAX];
for (cache_file = bmain->cachefiles.first; cache_file; cache_file = cache_file->id.next) {
for (cache_file = bmain->cachefile.first; cache_file; cache_file = cache_file->id.next) {
/* TODO: dependency graph should be updated to do drivers on cachefile.
* Execute drivers only, as animation has already been done. */
BKE_animsys_evaluate_animdata(depsgraph, scene, &cache_file->id, cache_file->adt, ctime, ADT_RECALC_DRIVERS);

22
source/blender/blenkernel/intern/main.c
View File

@ -340,7 +340,7 @@ ListBase *which_libbase(Main *bmain, short type)
case ID_IM:
return &(bmain->image);
case ID_LT:
return &(bmain->latt);
return &(bmain->lattice);
case ID_LA:
return &(bmain->light);
case ID_CA:
@ -386,13 +386,13 @@ ListBase *which_libbase(Main *bmain, short type)
case ID_LS:
return &(bmain->linestyle);
case ID_PAL:
return &(bmain->palettes);
return &(bmain->palette);
case ID_PC:
return &(bmain->paintcurves);
return &(bmain->paintcurve);
case ID_CF:
return &(bmain->cachefiles);
return &(bmain->cachefile);
case ID_WS:
return &(bmain->workspaces);
return &(bmain->workspace);
}
return NULL;
}
@ -413,7 +413,7 @@ int set_listbasepointers(Main *bmain, ListBase **lb)
lb[INDEX_ID_IP] = &(bmain->ipo);
lb[INDEX_ID_AC] = &(bmain->action); /* moved here to avoid problems when freeing with animato (aligorith) */
lb[INDEX_ID_KE] = &(bmain->key);
lb[INDEX_ID_PAL] = &(bmain->palettes); /* referenced by gpencil, so needs to be before that to avoid crashes */
lb[INDEX_ID_PAL] = &(bmain->palette); /* referenced by gpencil, so needs to be before that to avoid crashes */
lb[INDEX_ID_GD] = &(bmain->gpencil); /* referenced by nodes, objects, view, scene etc, before to free after. */
lb[INDEX_ID_NT] = &(bmain->nodetree);
lb[INDEX_ID_IM] = &(bmain->image);
@ -427,20 +427,20 @@ int set_listbasepointers(Main *bmain, ListBase **lb)
lb[INDEX_ID_AR] = &(bmain->armature);
lb[INDEX_ID_CF] = &(bmain->cachefiles);
lb[INDEX_ID_CF] = &(bmain->cachefile);
lb[INDEX_ID_ME] = &(bmain->mesh);
lb[INDEX_ID_CU] = &(bmain->curve);
lb[INDEX_ID_MB] = &(bmain->mball);
lb[INDEX_ID_LT] = &(bmain->latt);
lb[INDEX_ID_LT] = &(bmain->lattice);
lb[INDEX_ID_LA] = &(bmain->light);
lb[INDEX_ID_CA] = &(bmain->camera);
lb[INDEX_ID_TXT] = &(bmain->text);
lb[INDEX_ID_SO] = &(bmain->sound);
lb[INDEX_ID_GR] = &(bmain->collection);
lb[INDEX_ID_PAL] = &(bmain->palettes);
lb[INDEX_ID_PC] = &(bmain->paintcurves);
lb[INDEX_ID_PAL] = &(bmain->palette);
lb[INDEX_ID_PC] = &(bmain->paintcurve);
lb[INDEX_ID_BR] = &(bmain->brush);
lb[INDEX_ID_PA] = &(bmain->particle);
lb[INDEX_ID_SPK] = &(bmain->speaker);
@ -452,7 +452,7 @@ int set_listbasepointers(Main *bmain, ListBase **lb)
lb[INDEX_ID_OB] = &(bmain->object);
lb[INDEX_ID_LS] = &(bmain->linestyle); /* referenced by scenes */
lb[INDEX_ID_SCE] = &(bmain->scene);
lb[INDEX_ID_WS] = &(bmain->workspaces); /* before wm, so it's freed after it! */
lb[INDEX_ID_WS] = &(bmain->workspace); /* before wm, so it's freed after it! */
lb[INDEX_ID_WM] = &(bmain->wm);
lb[INDEX_ID_MSK] = &(bmain->mask);

10
source/blender/blenkernel/intern/workspace.c
View File

@ -123,7 +123,7 @@ static bool UNUSED_FUNCTION(workspaces_is_screen_used)
#endif
(const Main *bmain, bScreen *screen)
{
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
if (workspace_layout_find_exec(workspace, screen)) {
return true;
}
@ -185,7 +185,7 @@ WorkSpaceInstanceHook *BKE_workspace_instance_hook_create(const Main *bmain)
WorkSpaceInstanceHook *hook = MEM_callocN(sizeof(WorkSpaceInstanceHook), __func__);
/* set an active screen-layout for each possible window/workspace combination */
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
BKE_workspace_hook_layout_for_workspace_set(hook, workspace, workspace->layouts.first);
}
@ -194,10 +194,10 @@ WorkSpaceInstanceHook *BKE_workspace_instance_hook_create(const Main *bmain)
void BKE_workspace_instance_hook_free(const Main *bmain, WorkSpaceInstanceHook *hook)
{
/* workspaces should never be freed before wm (during which we call this function) */
BLI_assert(!BLI_listbase_is_empty(&bmain->workspaces));
BLI_assert(!BLI_listbase_is_empty(&bmain->workspace));
/* Free relations for this hook */
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
for (WorkSpaceDataRelation *relation = workspace->hook_layout_relations.first, *relation_next;
relation;
relation = relation_next)
@ -287,7 +287,7 @@ WorkSpaceLayout *BKE_workspace_layout_find_global(
*r_workspace = NULL;
}
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
if ((layout = workspace_layout_find_exec(workspace, screen))) {
if (r_workspace) {
*r_workspace = workspace;

12
source/blender/blenloader/intern/readfile.c
View File

@ -2670,7 +2670,7 @@ static void direct_link_brush(FileData *fd, Brush *brush)
static void lib_link_palette(FileData *fd, Main *main)
{
/* only link ID pointers */
for (Palette *palette = main->palettes.first; palette; palette = palette->id.next) {
for (Palette *palette = main->palette.first; palette; palette = palette->id.next) {
if (palette->id.tag & LIB_TAG_NEED_LINK) {
IDP_LibLinkProperty(palette->id.properties, fd);
@ -2689,7 +2689,7 @@ static void direct_link_palette(FileData *fd, Palette *palette)
static void lib_link_paint_curve(FileData *fd, Main *main)
{
/* only link ID pointers */
for (PaintCurve *pc = main->paintcurves.first; pc; pc = pc->id.next) {
for (PaintCurve *pc = main->paintcurve.first; pc; pc = pc->id.next) {
if (pc->id.tag & LIB_TAG_NEED_LINK) {
IDP_LibLinkProperty(pc->id.properties, fd);
@ -3168,7 +3168,7 @@ static void direct_link_animdata(FileData *fd, AnimData *adt)
static void lib_link_cachefiles(FileData *fd, Main *bmain)
{
/* only link ID pointers */
for (CacheFile *cache_file = bmain->cachefiles.first; cache_file; cache_file = cache_file->id.next) {
for (CacheFile *cache_file = bmain->cachefile.first; cache_file; cache_file = cache_file->id.next) {
if (cache_file->id.tag & LIB_TAG_NEED_LINK) {
IDP_LibLinkProperty(cache_file->id.properties, fd);
lib_link_animdata(fd, &cache_file->id, cache_file->adt);
@ -3197,7 +3197,7 @@ static void direct_link_cachefile(FileData *fd, CacheFile *cache_file)
static void lib_link_workspaces(FileData *fd, Main *bmain)
{
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
ListBase *layouts = BKE_workspace_layouts_get(workspace);
ID *id = (ID *)workspace;
@ -5142,7 +5142,7 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh)
static void lib_link_latt(FileData *fd, Main *main)
{
for (Lattice *lt = main->latt.first; lt; lt = lt->id.next) {
for (Lattice *lt = main->lattice.first; lt; lt = lt->id.next) {
if (lt->id.tag & LIB_TAG_NEED_LINK) {
IDP_LibLinkProperty(lt->id.properties, fd);
lib_link_animdata(fd, &lt->id, lt->adt);
@ -8057,7 +8057,7 @@ void blo_lib_link_restore(Main *oldmain, Main *newmain, wmWindowManager *curwm,
{
struct IDNameLib_Map *id_map = BKE_main_idmap_create(newmain, true, oldmain);
for (WorkSpace *workspace = newmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = newmain->workspace.first; workspace; workspace = workspace->id.next) {
ListBase *layouts = BKE_workspace_layouts_get(workspace);
for (WorkSpaceLayout *layout = layouts->first; layout; layout = layout->next) {

2
source/blender/blenloader/intern/versioning_250.c
View File

@ -957,7 +957,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
}
}
for (lt = bmain->latt.first; lt; lt = lt->id.next) {
for (lt = bmain->lattice.first; lt; lt = lt->id.next) {
if ((key = blo_do_versions_newlibadr(fd, lib, lt->key)) && key->refkey) {
data = key->refkey->data;
tot = MIN2(lt->pntsu * lt->pntsv * lt->pntsw, key->refkey->totelem);

6
source/blender/blenloader/intern/versioning_280.c
View File

@ -123,7 +123,7 @@ static void do_version_workspaces_create_from_screens(Main *bmain)
/* fullscreen with "Back to Previous" option, don't create
* a new workspace, add layout workspace containing parent */
workspace = BLI_findstring(
&bmain->workspaces, screen_parent->id.name + 2, offsetof(ID, name) + 2);
&bmain->workspace, screen_parent->id.name + 2, offsetof(ID, name) + 2);
}
else {
workspace = BKE_workspace_add(bmain, screen->id.name + 2);
@ -176,7 +176,7 @@ static void do_version_area_change_space_to_space_action(ScrArea *area, const Sc
*/
static void do_version_workspaces_after_lib_link(Main *bmain)
{
BLI_assert(BLI_listbase_is_empty(&bmain->workspaces));
BLI_assert(BLI_listbase_is_empty(&bmain->workspace));
do_version_workspaces_create_from_screens(bmain);
@ -194,7 +194,7 @@ static void do_version_workspaces_after_lib_link(Main *bmain)
continue;
}
WorkSpace *workspace = BLI_findstring(&bmain->workspaces, screen->id.name + 2, offsetof(ID, name) + 2);
WorkSpace *workspace = BLI_findstring(&bmain->workspace, screen->id.name + 2, offsetof(ID, name) + 2);
BLI_assert(workspace != NULL);
ListBase *layouts = BKE_workspace_layouts_get(workspace);

6
source/blender/blenloader/intern/versioning_defaults.c
View File

@ -192,7 +192,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
{
/* Default only has one window. */
wmWindow *win = ((wmWindowManager *)bmain->wm.first)->windows.first;
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
WorkSpaceLayout *layout = BKE_workspace_hook_layout_for_workspace_get(win->workspace_hook, workspace);
bScreen *screen = layout->screen;
BLI_strncpy(screen->id.name + 2, workspace->id.name + 2, sizeof(screen->id.name) - 2);
@ -218,7 +218,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
/* For 2D animation template. */
if (app_template && STREQ(app_template, "2D_Animation")) {
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
const char *name = workspace->id.name + 2;
if (STREQ(name, "Drawing")) {
@ -271,7 +271,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
if (builtin_template) {
/* Clear all tools to use default options instead, ignore the tool saved in the file. */
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
for (WorkSpace *workspace = bmain->workspace.first; workspace; workspace = workspace->id.next) {
while (!BLI_listbase_is_empty(&workspace->tools)) {
BKE_workspace_tool_remove(workspace, workspace->tools.first);
}

4
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -1379,7 +1379,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
sce = sce->id.next;
}
for (lt = bmain->latt.first; lt; lt = lt->id.next) {
for (lt = bmain->lattice.first; lt; lt = lt->id.next) {
if (lt->fu == 0.0f && lt->fv == 0.0f && lt->fw == 0.0f) {
calc_lat_fudu(lt->flag, lt->pntsu, &lt->fu, &lt->du);
calc_lat_fudu(lt->flag, lt->pntsv, &lt->fv, &lt->dv);
@ -2402,7 +2402,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
idproperties_fix_group_lengths(bmain->mat);
idproperties_fix_group_lengths(bmain->tex);
idproperties_fix_group_lengths(bmain->image);
idproperties_fix_group_lengths(bmain->latt);
idproperties_fix_group_lengths(bmain->lattice);
idproperties_fix_group_lengths(bmain->light);
idproperties_fix_group_lengths(bmain->camera);
idproperties_fix_group_lengths(bmain->ipo);

2
source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
View File

@ -132,7 +132,7 @@ void DepsgraphNodeBuilder::build_view_layer(
build_compositor(scene);
}
/* Cache file. */
LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefile) {
build_cachefile(cachefile);
}
/* Masks. */

2
source/blender/editors/animation/anim_filter.c
View File

@ -2981,7 +2981,7 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
/* Cache files level animations (frame duration and such). */
if (!(ads->filterflag2 & ADS_FILTER_NOCACHEFILES) && !(ads->filterflag & ADS_FILTER_ONLYSEL)) {
CacheFile *cache_file = ac->bmain->cachefiles.first;
CacheFile *cache_file = ac->bmain->cachefile.first;
for (; cache_file; cache_file = cache_file->id.next) {
items += animdata_filter_ds_cachefile(ac, anim_data, ads, cache_file, filter_mode);
}

2
source/blender/editors/screen/screen_edit.c
View File

@ -470,7 +470,7 @@ void ED_screens_initialize(Main *bmain, wmWindowManager *wm)
for (win = wm->windows.first; win; win = win->next) {
if (BKE_workspace_active_get(win->workspace_hook) == NULL) {
BKE_workspace_active_set(win->workspace_hook, bmain->workspaces.first);
BKE_workspace_active_set(win->workspace_hook, bmain->workspace.first);
}
ED_screen_refresh(wm, win);

2
source/blender/editors/screen/screen_ops.c
View File

@ -4913,7 +4913,7 @@ static int space_workspace_cycle_invoke(bContext *C, wmOperator *op, const wmEve
WorkSpace *workspace_dst = NULL;
ListBase ordered;
BKE_id_ordered_list(&ordered, &bmain->workspaces);
BKE_id_ordered_list(&ordered, &bmain->workspace);
for (LinkData *link = ordered.first; link; link = link->next) {
if (link->data == workspace_src) {

14
source/blender/editors/screen/workspace_edit.c
View File

@ -223,7 +223,7 @@ bool ED_workspace_delete(
{
ID *workspace_id = (ID *)workspace;
if (BLI_listbase_is_single(&bmain->workspaces)) {
if (BLI_listbase_is_single(&bmain->workspace)) {
return false;
}
@ -355,11 +355,11 @@ static int workspace_append_activate_exec(bContext *C, wmOperator *op)
RNA_string_get(op->ptr, "filepath", filepath);
if (workspace_append(C, filepath, idname) != OPERATOR_CANCELLED) {
WorkSpace *appended_workspace = BLI_findstring(&bmain->workspaces, idname, offsetof(ID, name) + 2);
WorkSpace *appended_workspace = BLI_findstring(&bmain->workspace, idname, offsetof(ID, name) + 2);
BLI_assert(appended_workspace != NULL);
/* Reorder to last position. */
BKE_id_reorder(&bmain->workspaces, &appended_workspace->id, NULL, true);
BKE_id_reorder(&bmain->workspace, &appended_workspace->id, NULL, true);
/* Changing workspace changes context. Do delayed! */
WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, appended_workspace);
@ -454,7 +454,7 @@ static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
if (startup_config) {
for (WorkSpace *workspace = startup_config->workspaces.first; workspace; workspace = workspace->id.next) {
uiLayout *row = uiLayoutRow(layout, false);
if (BLI_findstring(&bmain->workspaces, workspace->id.name, offsetof(ID, name))) {
if (BLI_findstring(&bmain->workspace, workspace->id.name, offsetof(ID, name))) {
uiLayoutSetActive(row, false);
}
@ -479,7 +479,7 @@ static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
}
uiLayout *row = uiLayoutRow(layout, false);
if (BLI_findstring(&bmain->workspaces, workspace->id.name, offsetof(ID, name))) {
if (BLI_findstring(&bmain->workspace, workspace->id.name, offsetof(ID, name))) {
uiLayoutSetActive(row, false);
}
@ -542,7 +542,7 @@ static int workspace_reorder_to_back_exec(bContext *C, wmOperator *UNUSED(op))
Main *bmain = CTX_data_main(C);
WorkSpace *workspace = workspace_context_get(C);
BKE_id_reorder(&bmain->workspaces, &workspace->id, NULL, true);
BKE_id_reorder(&bmain->workspace, &workspace->id, NULL, true);
WM_event_add_notifier(C, NC_WINDOW, NULL);
return OPERATOR_INTERFACE;
@ -565,7 +565,7 @@ static int workspace_reorder_to_front_exec(bContext *C, wmOperator *UNUSED(op))
Main *bmain = CTX_data_main(C);
WorkSpace *workspace = workspace_context_get(C);
BKE_id_reorder(&bmain->workspaces, &workspace->id, NULL, false);
BKE_id_reorder(&bmain->workspace, &workspace->id, NULL, false);
WM_event_add_notifier(C, NC_WINDOW, NULL);
return OPERATOR_INTERFACE;

46
source/blender/makesrna/intern/rna_main.c
View File

@ -150,10 +150,10 @@ static void rna_Main_image_begin(CollectionPropertyIterator *iter, PointerRNA *p
rna_iterator_listbase_begin(iter, &bmain->image, NULL);
}
static void rna_Main_latt_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
static void rna_Main_lattice_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Main *bmain = (Main *)ptr->data;
rna_iterator_listbase_begin(iter, &bmain->latt, NULL);
rna_iterator_listbase_begin(iter, &bmain->lattice, NULL);
}
static void rna_Main_camera_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
@ -240,10 +240,10 @@ static void rna_Main_particle_begin(CollectionPropertyIterator *iter, PointerRNA
rna_iterator_listbase_begin(iter, &bmain->particle, NULL);
}
static void rna_Main_palettes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
static void rna_Main_palette_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Main *bmain = (Main *)ptr->data;
rna_iterator_listbase_begin(iter, &bmain->palettes, NULL);
rna_iterator_listbase_begin(iter, &bmain->palette, NULL);
}
static void rna_Main_gpencil_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
@ -276,25 +276,25 @@ static void rna_Main_linestyle_begin(CollectionPropertyIterator *iter, PointerRN
rna_iterator_listbase_begin(iter, &bmain->linestyle, NULL);
}
static void rna_Main_cachefiles_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
static void rna_Main_cachefile_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Main *bmain = (Main *)ptr->data;
rna_iterator_listbase_begin(iter, &bmain->cachefiles, NULL);
rna_iterator_listbase_begin(iter, &bmain->cachefile, NULL);
}
static void rna_Main_paintcurves_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
static void rna_Main_paintcurve_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Main *bmain = (Main *)ptr->data;
rna_iterator_listbase_begin(iter, &bmain->paintcurves, NULL);
rna_iterator_listbase_begin(iter, &bmain->paintcurve, NULL);
}
static void rna_Main_workspaces_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
static void rna_Main_workspace_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Main *bmain = (Main *)ptr->data;
rna_iterator_listbase_begin(iter, &bmain->workspaces, NULL);
rna_iterator_listbase_begin(iter, &bmain->workspace, NULL);
}
static void rna_Main_lightprobes_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
static void rna_Main_lightprobe_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
Main *bmain = (Main *)ptr->data;
rna_iterator_listbase_begin(iter, &bmain->lightprobe, NULL);
@ -389,10 +389,10 @@ int rna_Main_image_lookup_string(PointerRNA *ptr, const char *key, struct Pointe
return rna_ID_lookup_string(&bmain->image, key, r_ptr);
}
int rna_Main_latt_lookup_string(PointerRNA *ptr, const char *key, struct PointerRNA *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->latt, key, r_ptr);
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)
@ -482,7 +482,7 @@ int rna_Main_particle_lookup_string(PointerRNA *ptr, const char *key, struct Poi
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->palettes, key, r_ptr);
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)
@ -512,19 +512,19 @@ int rna_Main_linestyle_lookup_string(PointerRNA *ptr, const char *key, struct Po
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->cachefiles, key, r_ptr);
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->paintcurves, key, r_ptr);
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->workspaces, key, r_ptr);
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)
@ -587,7 +587,7 @@ void RNA_def_main(BlenderRNA *brna)
{"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_latt_begin", "Lattices", "Lattice data-blocks", RNA_def_main_lattices, "rna_Main_latt_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"},
@ -602,15 +602,15 @@ void RNA_def_main(BlenderRNA *brna)
{"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature data-blocks", RNA_def_main_armatures, "rna_Main_armature_lookup_string"},
{"actions", "Action", "rna_Main_action_begin", "Actions", "Action data-blocks", RNA_def_main_actions, "rna_Main_action_lookup_string"},
{"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle data-blocks", RNA_def_main_particles, "rna_Main_particle_lookup_string"},
{"palettes", "Palette", "rna_Main_palettes_begin", "Palettes", "Palette data-blocks", RNA_def_main_palettes, "rna_Main_palette_lookup_string"},
{"palettes", "Palette", "rna_Main_palette_begin", "Palettes", "Palette data-blocks", RNA_def_main_palettes, "rna_Main_palette_lookup_string"},
{"grease_pencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil data-blocks", RNA_def_main_gpencil, "rna_Main_gpencil_lookup_string"},
{"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip data-blocks", RNA_def_main_movieclips, "rna_Main_movieclip_lookup_string"},
{"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks data-blocks", RNA_def_main_masks, "rna_Main_mask_lookup_string"},
{"linestyles", "FreestyleLineStyle", "rna_Main_linestyle_begin", "Line Styles", "Line Style data-blocks", RNA_def_main_linestyles, "rna_Main_linestyle_lookup_string"},
{"cache_files", "CacheFile", "rna_Main_cachefiles_begin", "Cache Files", "Cache Files data-blocks", RNA_def_main_cachefiles, "rna_Main_cachefile_lookup_string"},
{"paint_curves", "PaintCurve", "rna_Main_paintcurves_begin", "Paint Curves", "Paint Curves data-blocks", RNA_def_main_paintcurves, "rna_Main_paintcurve_lookup_string"},
{"workspaces", "WorkSpace", "rna_Main_workspaces_begin", "Workspaces", "Workspace data-blocks", RNA_def_main_workspaces, "rna_Main_workspace_lookup_string"},
{"lightprobes", "LightProbe", "rna_Main_lightprobes_begin", "LightProbes", "LightProbe data-blocks", RNA_def_main_lightprobes, "rna_Main_lightprobe_lookup_string"},
{"cache_files", "CacheFile", "rna_Main_cachefile_begin", "Cache Files", "Cache Files data-blocks", RNA_def_main_cachefiles, "rna_Main_cachefile_lookup_string"},
{"paint_curves", "PaintCurve", "rna_Main_paintcurve_begin", "Paint Curves", "Paint Curves data-blocks", RNA_def_main_paintcurves, "rna_Main_paintcurve_lookup_string"},
{"workspaces", "WorkSpace", "rna_Main_workspace_begin", "Workspaces", "Workspace data-blocks", RNA_def_main_workspaces, "rna_Main_workspace_lookup_string"},
{"lightprobes", "LightProbe", "rna_Main_lightprobe_begin", "LightProbes", "LightProbe data-blocks", RNA_def_main_lightprobes, "rna_Main_lightprobe_lookup_string"},
{NULL, NULL, NULL, NULL, NULL, NULL},
};

10
source/blender/makesrna/intern/rna_main_api.c
View File

@ -622,7 +622,7 @@ 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(window_managers, wm, ID_WM)
RNA_MAIN_ID_TAG_FUNCS_DEF(images, image, ID_IM)
RNA_MAIN_ID_TAG_FUNCS_DEF(lattices, latt, ID_LT)
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)
@ -637,14 +637,14 @@ 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, palettes, ID_PAL)
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, 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(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)
#undef RNA_MAIN_ID_TAG_FUNCS_DEF

2
source/blender/windowmanager/intern/wm_toolsystem.c
View File

@ -546,7 +546,7 @@ void WM_toolsystem_init(bContext *C)
BLI_assert(CTX_wm_window(C) == NULL);
LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspace) {
LISTBASE_FOREACH (bToolRef *, tref, &workspace->tools) {
MEM_SAFE_FREE(tref->runtime);
}