griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename idname -> name

Browse Source 
This isn't for ID's
This commit is contained in:
Campbell Barton
2018-05-23 14:05:12 +02:00
parent c0ac479134
commit b4b569feeb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2886,7 +2886,7 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
* except when loading linked data. */
Scene *scene = relation->parent;
if (scene->id.lib != NULL) {
relation->value = BLI_findstring(&scene->view_layers, relation->value_idname, offsetof(ViewLayer, name));
relation->value = BLI_findstring(&scene->view_layers, relation->value_name, offsetof(ViewLayer, name));
}
if (relation->value == NULL) {
relation->value = scene->view_layers.first;

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

@@ -3601,7 +3601,7 @@ static void write_workspace(WriteData *wd, WorkSpace *workspace)
relation;
relation = relation->next)
{
STRNCPY(relation->value_idname, ((ViewLayer *)relation->value)->name);
STRNCPY(relation->value_name, ((ViewLayer *)relation->value)->name);
}
writestruct(wd, ID_WS, WorkSpace, 1, workspace);

2
source/blender/makesdna/DNA_workspace_types.h
View File

@@ -182,7 +182,7 @@ typedef struct WorkSpaceDataRelation {
void *value;
/** Use when we reference non-ID data, this allows use to look it up when linking in a workspace. */
char value_idname[64]; /* MAX_NAME. */
char value_name[64]; /* MAX_NAME. */
} WorkSpaceDataRelation;
#endif /* DNA_PRIVATE_WORKSPACE_READ_WRITE */