From 1ba20947cc0b38d4b6cc9314eb7d8629c5a2add5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Mar 2022 12:04:22 +1100 Subject: Cleanup: rename CustomDataExternal.filename => filepath Reserve "filename" when only the name component is used. --- source/blender/blenkernel/BKE_customdata.h | 2 +- source/blender/blenkernel/intern/customdata.cc | 28 +++++++++++------------ source/blender/blenkernel/intern/mesh.cc | 2 +- source/blender/blenkernel/intern/mesh_evaluate.cc | 2 +- source/blender/makesdna/DNA_customdata_types.h | 2 +- source/blender/makesdna/DNA_pointcache_types.h | 2 +- source/blender/makesdna/intern/dna_rename_defs.h | 1 + source/blender/makesrna/intern/rna_modifier.c | 8 +++---- 8 files changed, 24 insertions(+), 23 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 911f4aab394..6b805a4c29d 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -589,7 +589,7 @@ void CustomData_layers__print(struct CustomData *data); /* External file storage */ void CustomData_external_add( - struct CustomData *data, struct ID *id, int type, int totelem, const char *filename); + struct CustomData *data, struct ID *id, int type, int totelem, const char *filepath); void CustomData_external_remove(struct CustomData *data, struct ID *id, int type, int totelem); bool CustomData_external_test(struct CustomData *data, int type); diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index 251d73dc315..82f03e18223 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -4472,12 +4472,12 @@ void CustomData_layers__print(CustomData *data) /****************************** External Files *******************************/ -static void customdata_external_filename(char filename[FILE_MAX], +static void customdata_external_filename(char filepath[FILE_MAX], ID *id, CustomDataExternal *external) { - BLI_strncpy(filename, external->filename, FILE_MAX); - BLI_path_abs(filename, ID_BLEND_PATH_FROM_GLOBAL(id)); + BLI_strncpy(filepath, external->filepath, FILE_MAX); + BLI_path_abs(filepath, ID_BLEND_PATH_FROM_GLOBAL(id)); } void CustomData_external_reload(CustomData *data, ID *UNUSED(id), CustomDataMask mask, int totelem) @@ -4502,7 +4502,7 @@ void CustomData_external_read(CustomData *data, ID *id, CustomDataMask mask, int { CustomDataExternal *external = data->external; CustomDataLayer *layer; - char filename[FILE_MAX]; + char filepath[FILE_MAX]; int update = 0; if (!external) { @@ -4528,12 +4528,12 @@ void CustomData_external_read(CustomData *data, ID *id, CustomDataMask mask, int return; } - customdata_external_filename(filename, id, external); + customdata_external_filename(filepath, id, external); CDataFile *cdf = cdf_create(CDF_TYPE_MESH); - if (!cdf_read_open(cdf, filename)) { + if (!cdf_read_open(cdf, filepath)) { cdf_free(cdf); - CLOG_ERROR(&LOG, "Failed to read %s layer from %s.", layerType_getName(layer->type), filename); + CLOG_ERROR(&LOG, "Failed to read %s layer from %s.", layerType_getName(layer->type), filepath); return; } @@ -4576,7 +4576,7 @@ void CustomData_external_write( { CustomDataExternal *external = data->external; int update = 0; - char filename[FILE_MAX]; + char filepath[FILE_MAX]; if (!external) { return; @@ -4601,7 +4601,7 @@ void CustomData_external_write( /* make sure data is read before we try to write */ CustomData_external_read(data, id, mask, totelem); - customdata_external_filename(filename, id, external); + customdata_external_filename(filepath, id, external); CDataFile *cdf = cdf_create(CDF_TYPE_MESH); @@ -4621,8 +4621,8 @@ void CustomData_external_write( } } - if (!cdf_write_open(cdf, filename)) { - CLOG_ERROR(&LOG, "Failed to open %s for writing.", filename); + if (!cdf_write_open(cdf, filepath)) { + CLOG_ERROR(&LOG, "Failed to open %s for writing.", filepath); cdf_free(cdf); return; } @@ -4650,7 +4650,7 @@ void CustomData_external_write( } if (i != data->totlayer) { - CLOG_ERROR(&LOG, "Failed to write data to %s.", filename); + CLOG_ERROR(&LOG, "Failed to write data to %s.", filepath); cdf_write_close(cdf); cdf_free(cdf); return; @@ -4675,7 +4675,7 @@ void CustomData_external_write( } void CustomData_external_add( - CustomData *data, ID *UNUSED(id), int type, int UNUSED(totelem), const char *filename) + CustomData *data, ID *UNUSED(id), int type, int UNUSED(totelem), const char *filepath) { CustomDataExternal *external = data->external; @@ -4694,7 +4694,7 @@ void CustomData_external_add( external = MEM_cnew(__func__); data->external = external; } - BLI_strncpy(external->filename, filename, sizeof(external->filename)); + BLI_strncpy(external->filepath, filepath, sizeof(external->filepath)); layer->flag |= CD_FLAG_EXTERNAL | CD_FLAG_IN_MEMORY; } diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index 97cc15e95cf..b30d8f92cc6 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -199,7 +199,7 @@ static void mesh_foreach_path(ID *id, BPathForeachPathData *bpath_data) { Mesh *me = (Mesh *)id; if (me->ldata.external) { - BKE_bpath_foreach_path_fixed_process(bpath_data, me->ldata.external->filename); + BKE_bpath_foreach_path_fixed_process(bpath_data, me->ldata.external->filepath); } } diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc index da0bd1f021d..6c5a5de31fc 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.cc +++ b/source/blender/blenkernel/intern/mesh_evaluate.cc @@ -695,7 +695,7 @@ static void bm_corners_to_loops_ex(ID *id, if (CustomData_external_test(fdata, CD_MDISPS)) { if (id && fdata->external) { - CustomData_external_add(ldata, id, CD_MDISPS, totloop, fdata->external->filename); + CustomData_external_add(ldata, id, CD_MDISPS, totloop, fdata->external->filepath); } } diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 2f9f63cb966..56e223cda5f 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -52,7 +52,7 @@ typedef struct CustomDataLayer { typedef struct CustomDataExternal { /** FILE_MAX. */ - char filename[1024]; + char filepath[1024]; } CustomDataExternal; /** diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h index b247176f537..1133237199b 100644 --- a/source/blender/makesdna/DNA_pointcache_types.h +++ b/source/blender/makesdna/DNA_pointcache_types.h @@ -131,7 +131,7 @@ enum { PTCACHE_FRAMES_SKIPPED = 1 << 8, PTCACHE_EXTERNAL = 1 << 9, PTCACHE_READ_INFO = 1 << 10, - /** Don't use the filename of the blend-file the data is linked from (write a local cache). */ + /** Don't use the file-path of the blend-file the data is linked from (write a local cache). */ PTCACHE_IGNORE_LIBPATH = 1 << 11, /** * High resolution cache is saved for smoke for backwards compatibility, diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 439d3fc7bcb..b2896c80db3 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -61,6 +61,7 @@ DNA_STRUCT_RENAME_ELEM(Curve, ext1, extrude) DNA_STRUCT_RENAME_ELEM(Curve, ext2, bevel_radius) DNA_STRUCT_RENAME_ELEM(Curve, len_wchar, len_char32) DNA_STRUCT_RENAME_ELEM(Curve, width, offset) +DNA_STRUCT_RENAME_ELEM(CustomDataExternal, filename, filepath) DNA_STRUCT_RENAME_ELEM(Editing, over_border, overlay_frame_rect) DNA_STRUCT_RENAME_ELEM(Editing, over_cfra, overlay_frame_abs) DNA_STRUCT_RENAME_ELEM(Editing, over_flag, overlay_frame_flag) 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) -- cgit v1.2.3