Commit: b4b569feebd0c2486808ebb93b5b1fcac8aae749
Author: Campbell Barton
Date: Wed May 23 14:05:12 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb4b569feebd0c2486808ebb93b5b1fcac8aae749
Cleanup: rename idname -> name
This isn't for ID's
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/makesdna/DNA_workspace_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 6695b6ced37..6d3f95fa63c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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;
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index a1789ac3d5d..d94fe790c9d 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -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);
diff --git a/source/blender/makesdna/DNA_workspace_types.h
b/source/blender/makesdna/DNA_workspace_types.h
index 784e563486f..83b6867afd3 100644
--- a/source/blender/makesdna/DNA_workspace_types.h
+++ b/source/blender/makesdna/DNA_workspace_types.h
@@ -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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
