diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:22 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-25 04:10:30 +0300 |
commit | 1ba20947cc0b38d4b6cc9314eb7d8629c5a2add5 (patch) | |
tree | 798cf5ab544b1b32a2084cca895b43b66f67d23d /source/blender/makesrna | |
parent | 7d1d9e601503fb7e921c935524fec1469363c121 (diff) |
Cleanup: rename CustomDataExternal.filename => filepath
Reserve "filename" when only the name component is used.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index b12b33c67af..2ef2e776842 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1074,7 +1074,7 @@ static void rna_MultiresModifier_filepath_get(PointerRNA *ptr, char *value) Object *ob = (Object *)ptr->owner_id; CustomDataExternal *external = ((Mesh *)ob->data)->ldata.external; - BLI_strncpy(value, (external) ? external->filename : "", sizeof(external->filename)); + BLI_strncpy(value, (external) ? external->filepath : "", sizeof(external->filepath)); } static void rna_MultiresModifier_filepath_set(PointerRNA *ptr, const char *value) @@ -1082,8 +1082,8 @@ static void rna_MultiresModifier_filepath_set(PointerRNA *ptr, const char *value Object *ob = (Object *)ptr->owner_id; CustomDataExternal *external = ((Mesh *)ob->data)->ldata.external; - if (external && !STREQ(external->filename, value)) { - BLI_strncpy(external->filename, value, sizeof(external->filename)); + if (external && !STREQ(external->filepath, value)) { + BLI_strncpy(external->filepath, value, sizeof(external->filepath)); multires_force_external_reload(ob); } } @@ -1093,7 +1093,7 @@ static int rna_MultiresModifier_filepath_length(PointerRNA *ptr) Object *ob = (Object *)ptr->owner_id; CustomDataExternal *external = ((Mesh *)ob->data)->ldata.external; - return strlen((external) ? external->filename : ""); + return strlen((external) ? external->filepath : ""); } static int rna_ShrinkwrapModifier_face_cull_get(PointerRNA *ptr) |