blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Cleanup: rename BLI_strescape to BLI_str_escape 

Prepare for `BLI_str_unescape` which doesn't read well
without the separator.
This commit is contained in:
Campbell Barton 2020-12-10 13:25:49 +11:00
parent 548e9624d0
commit 65f139117d
34 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/anim_data.c
View File

@ -989,8 +989,8 @@ char *BKE_animsys_fix_rna_path_rename(ID *owner_id,
char *name_old_esc = BLI_array_alloca(name_old_esc, (name_old_len * 2) + 1);
char *name_new_esc = BLI_array_alloca(name_new_esc, (name_new_len * 2) + 1);
BLI_strescape(name_old_esc, oldName, (name_old_len * 2) + 1);
BLI_strescape(name_new_esc, newName, (name_new_len * 2) + 1);
BLI_str_escape(name_old_esc, oldName, (name_old_len * 2) + 1);
BLI_str_escape(name_new_esc, newName, (name_new_len * 2) + 1);
oldN = BLI_sprintfN("[\"%s\"]", name_old_esc);
newN = BLI_sprintfN("[\"%s\"]", name_new_esc);
}
@ -1048,8 +1048,8 @@ void BKE_action_fix_paths_rename(ID *owner_id,
char *name_old_esc = BLI_array_alloca(name_old_esc, (name_old_len * 2) + 1);
char *name_new_esc = BLI_array_alloca(name_new_esc, (name_new_len * 2) + 1);
BLI_strescape(name_old_esc, oldName, (name_old_len * 2) + 1);
BLI_strescape(name_new_esc, newName, (name_new_len * 2) + 1);
BLI_str_escape(name_old_esc, oldName, (name_old_len * 2) + 1);
BLI_str_escape(name_new_esc, newName, (name_new_len * 2) + 1);
oldN = BLI_sprintfN("[\"%s\"]", name_old_esc);
newN = BLI_sprintfN("[\"%s\"]", name_new_esc);
}
@ -1096,8 +1096,8 @@ void BKE_animdata_fix_paths_rename(ID *owner_id,
char *name_old_esc = BLI_array_alloca(name_old_esc, (name_old_len * 2) + 1);
char *name_new_esc = BLI_array_alloca(name_new_esc, (name_new_len * 2) + 1);
BLI_strescape(name_old_esc, oldName, (name_old_len * 2) + 1);
BLI_strescape(name_new_esc, newName, (name_new_len * 2) + 1);
BLI_str_escape(name_old_esc, oldName, (name_old_len * 2) + 1);
BLI_str_escape(name_new_esc, newName, (name_new_len * 2) + 1);
oldN = BLI_sprintfN("[\"%s\"]", name_old_esc);
newN = BLI_sprintfN("[\"%s\"]", name_new_esc);
}

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

@ -2017,7 +2017,7 @@ char *BKE_linestyle_path_to_color_ramp(FreestyleLineStyle *linestyle, ColorBand
if (found) {
char name_esc[sizeof(m->name) * 2];
BLI_strescape(name_esc, m->name, sizeof(name_esc));
BLI_str_escape(name_esc, m->name, sizeof(name_esc));
return BLI_sprintfN("color_modifiers[\"%s\"].color_ramp", name_esc);
}
}

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

@ -2708,7 +2708,7 @@ void nodeRemoveNode(Main *bmain, bNodeTree *ntree, bNode *node, bool do_id_user)
char propname_esc[MAX_IDPROP_NAME * 2];
char prefix[MAX_IDPROP_NAME * 2];
BLI_strescape(propname_esc, node->name, sizeof(propname_esc));
BLI_str_escape(propname_esc, node->name, sizeof(propname_esc));
BLI_snprintf(prefix, sizeof(prefix), "nodes[\"%s\"]", propname_esc);
if (BKE_animdata_fix_paths_remove((ID *)ntree, prefix)) {

12
source/blender/blenkernel/intern/tracking.c
View File

@ -3138,13 +3138,13 @@ void BKE_tracking_get_rna_path_for_track(const struct MovieTracking *tracking,
{
MovieTrackingObject *object = BKE_tracking_find_object_for_track(tracking, track);
char track_name_esc[MAX_NAME * 2];
BLI_strescape(track_name_esc, track->name, sizeof(track_name_esc));
BLI_str_escape(track_name_esc, track->name, sizeof(track_name_esc));
if (object == NULL) {
BLI_snprintf(rna_path, rna_path_len, "tracking.tracks[\"%s\"]", track_name_esc);
}
else {
char object_name_esc[MAX_NAME * 2];
BLI_strescape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_str_escape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_snprintf(rna_path,
rna_path_len,
"tracking.objects[\"%s\"].tracks[\"%s\"]",
@ -3164,7 +3164,7 @@ void BKE_tracking_get_rna_path_prefix_for_track(const struct MovieTracking *trac
}
else {
char object_name_esc[MAX_NAME * 2];
BLI_strescape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_str_escape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_snprintf(rna_path, rna_path_len, "tracking.objects[\"%s\"]", object_name_esc);
}
}
@ -3176,13 +3176,13 @@ void BKE_tracking_get_rna_path_for_plane_track(const struct MovieTracking *track
{
MovieTrackingObject *object = BKE_tracking_find_object_for_plane_track(tracking, plane_track);
char track_name_esc[MAX_NAME * 2];
BLI_strescape(track_name_esc, plane_track->name, sizeof(track_name_esc));
BLI_str_escape(track_name_esc, plane_track->name, sizeof(track_name_esc));
if (object == NULL) {
BLI_snprintf(rna_path, rna_path_len, "tracking.plane_tracks[\"%s\"]", track_name_esc);
}
else {
char object_name_esc[MAX_NAME * 2];
BLI_strescape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_str_escape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_snprintf(rna_path,
rna_path_len,
"tracking.objects[\"%s\"].plane_tracks[\"%s\"]",
@ -3203,7 +3203,7 @@ void BKE_tracking_get_rna_path_prefix_for_plane_track(
}
else {
char object_name_esc[MAX_NAME * 2];
BLI_strescape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_str_escape(object_name_esc, object->name, sizeof(object_name_esc));
BLI_snprintf(rna_path, rna_path_len, "tracking.objects[\"%s\"].plane_tracks", object_name_esc);
}
}

2
source/blender/blenlib/BLI_string.h
View File

@ -85,7 +85,7 @@ size_t BLI_vsnprintf_rlen(char *__restrict buffer,
char *BLI_sprintfN(const char *__restrict format, ...) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL(1) ATTR_MALLOC ATTR_PRINTF_FORMAT(1, 2);
size_t BLI_strescape(char *__restrict dst, const char *__restrict src, const size_t maxncpy)
size_t BLI_str_escape(char *__restrict dst, const char *__restrict src, const size_t maxncpy)
ATTR_NONNULL();
size_t BLI_str_format_int_grouped(char dst[16], int num) ATTR_NONNULL();

2
source/blender/blenlib/intern/string.c
View File

@ -322,7 +322,7 @@ char *BLI_sprintfN(const char *__restrict format, ...)
* TODO: support more fancy string escaping. current code is primitive
* this basically is an ascii version of PyUnicode_EncodeUnicodeEscape()
* which is a useful reference. */
size_t BLI_strescape(char *__restrict dst, const char *__restrict src, const size_t maxncpy)
size_t BLI_str_escape(char *__restrict dst, const char *__restrict src, const size_t maxncpy)
{
size_t len = 0;

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

@ -181,7 +181,7 @@ static void seq_convert_transform_crop(const Scene *scene,
/* Convert offset animation, but only if crop is not used. */
if ((seq->flag & use_transform_flag) != 0 && (seq->flag & use_crop_flag) == 0) {
char name_esc[(sizeof(seq->name) - 2) * 2], *path;
BLI_strescape(name_esc, seq->name + 2, sizeof(name_esc));
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
path = BLI_sprintfN("sequence_editor.sequences_all[\"%s\"].transform.offset_x", name_esc);
seq_convert_transform_animation(scene, path, image_size_x);
@ -408,7 +408,7 @@ void do_versions_after_linking_290(Main *bmain, ReportList *UNUSED(reports))
const size_t node_name_escaped_max_length = (node_name_length * 2);
char *node_name_escaped = MEM_mallocN(node_name_escaped_max_length + 1,
"escaped name");
BLI_strescape(node_name_escaped, node->name, node_name_escaped_max_length);
BLI_str_escape(node_name_escaped, node->name, node_name_escaped_max_length);
char *rna_path_prefix = BLI_sprintfN("nodes[\"%s\"].inputs", node_name_escaped);
BKE_animdata_fix_paths_rename_all_ex(

2
source/blender/gpu/intern/gpu_batch.cc
View File

@ -81,7 +81,7 @@ void GPU_batch_init_ex(GPUBatch *batch,
for (int v = 1; v < GPU_BATCH_VBO_MAX_LEN; v++) {
batch->verts[v] = nullptr;
}
for (auto & v : batch->inst) {
for (auto &v : batch->inst) {
v = nullptr;
}
batch->elem = elem;

8
source/blender/makesrna/intern/rna_access.c
View File

@ -6016,7 +6016,7 @@ char *RNA_path_from_ID_to_property_index(PointerRNA *ptr,
}
else {
char propname_esc[MAX_IDPROP_NAME * 2];
BLI_strescape(propname_esc, propname, sizeof(propname_esc));
BLI_str_escape(propname_esc, propname, sizeof(propname_esc));
path = BLI_sprintfN("%s[\"%s\"]%s", ptrpath, propname_esc, index_str);
}
MEM_freeN(ptrpath);
@ -6027,7 +6027,7 @@ char *RNA_path_from_ID_to_property_index(PointerRNA *ptr,
}
else {
char propname_esc[MAX_IDPROP_NAME * 2];
BLI_strescape(propname_esc, propname, sizeof(propname_esc));
BLI_str_escape(propname_esc, propname, sizeof(propname_esc));
path = BLI_sprintfN("[\"%s\"]%s", propname_esc, index_str);
}
}
@ -6113,7 +6113,7 @@ char *RNA_path_full_ID_py(Main *bmain, ID *id)
char id_esc[(sizeof(id->name) - 2) * 2];
BLI_strescape(id_esc, id->name + 2, sizeof(id_esc));
BLI_str_escape(id_esc, id->name + 2, sizeof(id_esc));
return BLI_sprintfN("bpy.data.%s[\"%s\"]%s%s",
BKE_idtype_idcode_to_name_plural(GS(id->name)),
@ -7067,7 +7067,7 @@ char *RNA_property_as_string(
buf = MEM_mallocN(sizeof(char) * (length + 1), "RNA_property_as_string");
buf_esc = MEM_mallocN(sizeof(char) * (length * 2 + 1), "RNA_property_as_string esc");
RNA_property_string_get(ptr, prop, buf);
BLI_strescape(buf_esc, buf, length * 2 + 1);
BLI_str_escape(buf_esc, buf, length * 2 + 1);
MEM_freeN(buf);
BLI_dynstr_appendf(dynstr, "\"%s\"", buf_esc);
MEM_freeN(buf_esc);

2
source/blender/makesrna/intern/rna_armature.c
View File

@ -245,7 +245,7 @@ static char *rna_Bone_path(PointerRNA *ptr)
Bone *bone = (Bone *)ptr->data;
char name_esc[sizeof(bone->name) * 2];
BLI_strescape(name_esc, bone->name, sizeof(name_esc));
BLI_str_escape(name_esc, bone->name, sizeof(name_esc));
/* special exception for trying to get the path where ID-block is Object
* - this will be assumed to be from a Pose Bone...

2
source/blender/makesrna/intern/rna_boid.c
View File

@ -183,7 +183,7 @@ static char *rna_BoidRule_path(PointerRNA *ptr)
BoidRule *rule = (BoidRule *)ptr->data;
char name_esc[sizeof(rule->name) * 2];
BLI_strescape(name_esc, rule->name, sizeof(name_esc));
BLI_str_escape(name_esc, rule->name, sizeof(name_esc));
return BLI_sprintfN("rules[\"%s\"]", name_esc); /* XXX not unique */
}

4
source/blender/makesrna/intern/rna_cloth.c
View File

@ -439,7 +439,7 @@ static char *rna_ClothSettings_path(PointerRNA *ptr)
if (md) {
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].settings", name_esc);
}
else {
@ -454,7 +454,7 @@ static char *rna_ClothCollisionSettings_path(PointerRNA *ptr)
if (md) {
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].collision_settings", name_esc);
}
else {

6
source/blender/makesrna/intern/rna_constraint.c
View File

@ -433,13 +433,13 @@ static char *rna_Constraint_do_compute_path(Object *ob, bConstraint *con)
if (pchan) {
char name_esc_pchan[sizeof(pchan->name) * 2];
char name_esc_const[sizeof(con->name) * 2];
BLI_strescape(name_esc_pchan, pchan->name, sizeof(name_esc_pchan));
BLI_strescape(name_esc_const, con->name, sizeof(name_esc_const));
BLI_str_escape(name_esc_pchan, pchan->name, sizeof(name_esc_pchan));
BLI_str_escape(name_esc_const, con->name, sizeof(name_esc_const));
return BLI_sprintfN("pose.bones[\"%s\"].constraints[\"%s\"]", name_esc_pchan, name_esc_const);
}
else {
char name_esc_const[sizeof(con->name) * 2];
BLI_strescape(name_esc_const, con->name, sizeof(name_esc_const));
BLI_str_escape(name_esc_const, con->name, sizeof(name_esc_const));
return BLI_sprintfN("constraints[\"%s\"]", name_esc_const);
}
}

8
source/blender/makesrna/intern/rna_dynamicpaint.c
View File

@ -57,7 +57,7 @@ static char *rna_DynamicPaintCanvasSettings_path(PointerRNA *ptr)
ModifierData *md = (ModifierData *)settings->pmd;
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].canvas_settings", name_esc);
}
@ -67,7 +67,7 @@ static char *rna_DynamicPaintBrushSettings_path(PointerRNA *ptr)
ModifierData *md = (ModifierData *)settings->pmd;
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].brush_settings", name_esc);
}
@ -78,8 +78,8 @@ static char *rna_DynamicPaintSurface_path(PointerRNA *ptr)
char name_esc[sizeof(md->name) * 2];
char name_esc_surface[sizeof(surface->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_strescape(name_esc_surface, surface->name, sizeof(name_esc_surface));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc_surface, surface->name, sizeof(name_esc_surface));
return BLI_sprintfN(
"modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"]", name_esc, name_esc_surface);
}

6
source/blender/makesrna/intern/rna_fluid.c
View File

@ -872,7 +872,7 @@ static char *rna_FluidDomainSettings_path(PointerRNA *ptr)
ModifierData *md = (ModifierData *)settings->fmd;
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].domain_settings", name_esc);
}
@ -882,7 +882,7 @@ static char *rna_FluidFlowSettings_path(PointerRNA *ptr)
ModifierData *md = (ModifierData *)settings->fmd;
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].flow_settings", name_esc);
}
@ -892,7 +892,7 @@ static char *rna_FluidEffectorSettings_path(PointerRNA *ptr)
ModifierData *md = (ModifierData *)settings->fmd;
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].effector_settings", name_esc);
}

6
source/blender/makesrna/intern/rna_gpencil.c
View File

@ -308,7 +308,7 @@ static char *rna_GPencilLayer_path(PointerRNA *ptr)
bGPDlayer *gpl = (bGPDlayer *)ptr->data;
char name_esc[sizeof(gpl->info) * 2];
BLI_strescape(name_esc, gpl->info, sizeof(name_esc));
BLI_str_escape(name_esc, gpl->info, sizeof(name_esc));
return BLI_sprintfN("layers[\"%s\"]", name_esc);
}
@ -406,8 +406,8 @@ static char *rna_GPencilLayerMask_path(PointerRNA *ptr)
char name_layer[sizeof(gpl->info) * 2];
char name_mask[sizeof(mask->name) * 2];
BLI_strescape(name_layer, gpl->info, sizeof(name_layer));
BLI_strescape(name_mask, mask->name, sizeof(name_mask));
BLI_str_escape(name_layer, gpl->info, sizeof(name_layer));
BLI_str_escape(name_mask, mask->name, sizeof(name_mask));
return BLI_sprintfN("layers[\"%s\"].mask_layers[\"%s\"]", name_layer, name_mask);
}

2
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@ -276,7 +276,7 @@ static char *rna_GpencilModifier_path(PointerRNA *ptr)
GpencilModifierData *gmd = ptr->data;
char name_esc[sizeof(gmd->name) * 2];
BLI_strescape(name_esc, gmd->name, sizeof(name_esc));
BLI_str_escape(name_esc, gmd->name, sizeof(name_esc));
return BLI_sprintfN("grease_pencil_modifiers[\"%s\"]", name_esc);
}

4
source/blender/makesrna/intern/rna_key.c
View File

@ -676,7 +676,7 @@ static char *rna_ShapeKey_path(PointerRNA *ptr)
ID *id = ptr->owner_id;
char name_esc[sizeof(kb->name) * 2];
BLI_strescape(name_esc, kb->name, sizeof(name_esc));
BLI_str_escape(name_esc, kb->name, sizeof(name_esc));
if ((id) && (GS(id->name) != ID_KE)) {
return BLI_sprintfN("shape_keys.key_blocks[\"%s\"]", name_esc);
@ -774,7 +774,7 @@ static char *rna_ShapeKeyPoint_path(PointerRNA *ptr)
index = rna_ShapeKey_curve_find_index(key, index);
}
BLI_strescape(name_esc_kb, kb->name, sizeof(name_esc_kb));
BLI_str_escape(name_esc_kb, kb->name, sizeof(name_esc_kb));
if (GS(id->name) == ID_KE) {
return BLI_sprintfN("key_blocks[\"%s\"].data[%d]", name_esc_kb, index);

2
source/blender/makesrna/intern/rna_layer.c
View File

@ -115,7 +115,7 @@ static char *rna_ViewLayer_path(PointerRNA *ptr)
ViewLayer *srl = (ViewLayer *)ptr->data;
char name_esc[sizeof(srl->name) * 2];
BLI_strescape(name_esc, srl->name, sizeof(name_esc));
BLI_str_escape(name_esc, srl->name, sizeof(name_esc));
return BLI_sprintfN("view_layers[\"%s\"]", name_esc);
}

8
source/blender/makesrna/intern/rna_linestyle.c
View File

@ -257,7 +257,7 @@ static char *rna_LineStyle_color_modifier_path(PointerRNA *ptr)
{
LineStyleModifier *m = (LineStyleModifier *)ptr->data;
char name_esc[sizeof(m->name) * 2];
BLI_strescape(name_esc, m->name, sizeof(name_esc));
BLI_str_escape(name_esc, m->name, sizeof(name_esc));
return BLI_sprintfN("color_modifiers[\"%s\"]", name_esc);
}
@ -265,7 +265,7 @@ static char *rna_LineStyle_alpha_modifier_path(PointerRNA *ptr)
{
LineStyleModifier *m = (LineStyleModifier *)ptr->data;
char name_esc[sizeof(m->name) * 2];
BLI_strescape(name_esc, m->name, sizeof(name_esc));
BLI_str_escape(name_esc, m->name, sizeof(name_esc));
return BLI_sprintfN("alpha_modifiers[\"%s\"]", name_esc);
}
@ -273,7 +273,7 @@ static char *rna_LineStyle_thickness_modifier_path(PointerRNA *ptr)
{
LineStyleModifier *m = (LineStyleModifier *)ptr->data;
char name_esc[sizeof(m->name) * 2];
BLI_strescape(name_esc, m->name, sizeof(name_esc));
BLI_str_escape(name_esc, m->name, sizeof(name_esc));
return BLI_sprintfN("thickness_modifiers[\"%s\"]", name_esc);
}
@ -281,7 +281,7 @@ static char *rna_LineStyle_geometry_modifier_path(PointerRNA *ptr)
{
LineStyleModifier *m = (LineStyleModifier *)ptr->data;
char name_esc[sizeof(m->name) * 2];
BLI_strescape(name_esc, m->name, sizeof(name_esc));
BLI_str_escape(name_esc, m->name, sizeof(name_esc));
return BLI_sprintfN("geometry_modifiers[\"%s\"]", name_esc);
}

2
source/blender/makesrna/intern/rna_mask.c
View File

@ -182,7 +182,7 @@ static char *rna_MaskLayer_path(PointerRNA *ptr)
{
MaskLayer *masklay = (MaskLayer *)ptr->data;
char name_esc[sizeof(masklay->name) * 2];
BLI_strescape(name_esc, masklay->name, sizeof(name_esc));
BLI_str_escape(name_esc, masklay->name, sizeof(name_esc));
return BLI_sprintfN("layers[\"%s\"]", name_esc);
}

30
source/blender/makesrna/intern/rna_mesh.c
View File

@ -670,7 +670,7 @@ static char *rna_MeshUVLoopLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("uv_layers[\"%s\"]", name_esc);
}
@ -913,7 +913,7 @@ static char *rna_MeshSkinVertexLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("skin_vertices[\"%s\"]", name_esc);
}
@ -945,7 +945,7 @@ static char *rna_MeshPaintMaskLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("vertex_paint_masks[\"%s\"]", name_esc);
}
@ -979,7 +979,7 @@ static char *rna_MeshFaceMapLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("face_maps[\"%s\"]", name_esc);
}
@ -1189,7 +1189,7 @@ static char *rna_VertCustomData_data_path(PointerRNA *ptr, const char *collectio
b = ((char *)ptr->data - ((char *)cdl->data)) / CustomData_sizeof(type);
if (b >= 0 && b < totvert) {
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("%s[\"%s\"].data[%d]", collection, name_esc, b);
}
}
@ -1210,7 +1210,7 @@ static char *rna_PolyCustomData_data_path(PointerRNA *ptr, const char *collectio
b = ((char *)ptr->data - ((char *)cdl->data)) / CustomData_sizeof(type);
if (b >= 0 && b < totpoly) {
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("%s[\"%s\"].data[%d]", collection, name_esc, b);
}
}
@ -1231,7 +1231,7 @@ static char *rna_LoopCustomData_data_path(PointerRNA *ptr, const char *collectio
b = ((char *)ptr->data - ((char *)cdl->data)) / CustomData_sizeof(type);
if (b >= 0 && b < totloop) {
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("%s[\"%s\"].data[%d]", collection, name_esc, b);
}
}
@ -1249,7 +1249,7 @@ static char *rna_MeshLoopColorLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("vertex_colors[\"%s\"]", name_esc);
}
@ -1262,7 +1262,7 @@ static char *rna_MeshVertColorLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("sculpt_vertex_colors[\"%s\"]", name_esc);
}
@ -1276,14 +1276,14 @@ static char *rna_MeshVertexFloatPropertyLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("vertex_float_layers[\"%s\"]", name_esc);
}
static char *rna_MeshPolygonFloatPropertyLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("polygon_float_layers[\"%s\"]", name_esc);
}
@ -1327,14 +1327,14 @@ static char *rna_MeshVertexIntPropertyLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("vertex_int_layers[\"%s\"]", name_esc);
}
static char *rna_MeshPolygonIntPropertyLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("polygon_int_layers[\"%s\"]", name_esc);
}
@ -1378,14 +1378,14 @@ static char *rna_MeshVertexStringPropertyLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("vertex_string_layers[\"%s\"]", name_esc);
}
static char *rna_MeshPolygonStringPropertyLayer_path(PointerRNA *ptr)
{
CustomDataLayer *cdl = ptr->data;
char name_esc[sizeof(cdl->name) * 2];
BLI_strescape(name_esc, cdl->name, sizeof(name_esc));
BLI_str_escape(name_esc, cdl->name, sizeof(name_esc));
return BLI_sprintfN("polygon_string_layers[\"%s\"]", name_esc);
}

2
source/blender/makesrna/intern/rna_modifier.c
View File

@ -660,7 +660,7 @@ static char *rna_Modifier_path(PointerRNA *ptr)
ModifierData *md = ptr->data;
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"]", name_esc);
}

4
source/blender/makesrna/intern/rna_nla.c
View File

@ -88,8 +88,8 @@ static char *rna_NlaStrip_path(PointerRNA *ptr)
char name_esc_nlt[sizeof(nlt->name) * 2];
char name_esc_strip[sizeof(strip->name) * 2];
BLI_strescape(name_esc_nlt, nlt->name, sizeof(name_esc_nlt));
BLI_strescape(name_esc_strip, strip->name, sizeof(name_esc_strip));
BLI_str_escape(name_esc_nlt, nlt->name, sizeof(name_esc_nlt));
BLI_str_escape(name_esc_strip, strip->name, sizeof(name_esc_strip));
return BLI_sprintfN(
"animation_data.nla_tracks[\"%s\"].strips[\"%s\"]", name_esc_nlt, name_esc_strip);
}

6
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -1457,7 +1457,7 @@ static char *rna_Node_path(PointerRNA *ptr)
bNode *node = (bNode *)ptr->data;
char name_esc[sizeof(node->name) * 2];
BLI_strescape(name_esc, node->name, sizeof(name_esc));
BLI_str_escape(name_esc, node->name, sizeof(name_esc));
return BLI_sprintfN("nodes[\"%s\"]", name_esc);
}
@ -1484,7 +1484,7 @@ char *rna_Node_ImageUser_path(PointerRNA *ptr)
continue;
}
BLI_strescape(name_esc, node->name, sizeof(name_esc));
BLI_str_escape(name_esc, node->name, sizeof(name_esc));
return BLI_sprintfN("nodes[\"%s\"].image_user", name_esc);
}
@ -2463,7 +2463,7 @@ static char *rna_NodeSocket_path(PointerRNA *ptr)
return NULL;
}
BLI_strescape(name_esc, node->name, sizeof(name_esc));
BLI_str_escape(name_esc, node->name, sizeof(name_esc));
if (sock->in_out == SOCK_IN) {
return BLI_sprintfN("nodes[\"%s\"].inputs[%d]", name_esc, socketindex);

18
source/blender/makesrna/intern/rna_object_force.c
View File

@ -154,7 +154,7 @@ static char *rna_PointCache_path(PointerRNA *ptr)
}
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
switch (md->type) {
case eModifierType_ParticleSystem: {
@ -171,7 +171,7 @@ static char *rna_PointCache_path(PointerRNA *ptr)
for (; surface; surface = surface->next) {
if (surface->pointcache == cache) {
char name_surface_esc[sizeof(surface->name) * 2];
BLI_strescape(name_surface_esc, surface->name, sizeof(name_surface_esc));
BLI_str_escape(name_surface_esc, surface->name, sizeof(name_surface_esc));
return BLI_sprintfN(
"modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"].point_cache",
name_esc,
@ -436,7 +436,7 @@ static char *rna_CollisionSettings_path(PointerRNA *UNUSED(ptr))
if (md) {
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].settings", name_esc);
}
else {
@ -608,7 +608,7 @@ static char *rna_SoftBodySettings_path(PointerRNA *ptr)
ModifierData *md = (ModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Softbody);
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].settings", name_esc);
}
@ -797,7 +797,7 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
/* no pointer from modifier data to actual softbody storage, would be good to add */
if (ob->soft->effector_weights == ew) {
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
}
}
@ -808,7 +808,7 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
ClothModifierData *cmd = (ClothModifierData *)md;
if (cmd->sim_parms->effector_weights == ew) {
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].settings.effector_weights", name_esc);
}
}
@ -820,7 +820,7 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
if (fmd->type == MOD_FLUID_TYPE_DOMAIN && fmd->domain &&
fmd->domain->effector_weights == ew) {
char name_esc[sizeof(md->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
return BLI_sprintfN("modifiers[\"%s\"].domain_settings.effector_weights", name_esc);
}
}
@ -838,8 +838,8 @@ static char *rna_EffectorWeight_path(PointerRNA *ptr)
char name_esc[sizeof(md->name) * 2];
char name_esc_surface[sizeof(surface->name) * 2];
BLI_strescape(name_esc, md->name, sizeof(name_esc));
BLI_strescape(name_esc_surface, surface->name, sizeof(name_esc_surface));
BLI_str_escape(name_esc, md->name, sizeof(name_esc));
BLI_str_escape(name_esc_surface, surface->name, sizeof(name_esc_surface));
return BLI_sprintfN(
"modifiers[\"%s\"].canvas_settings.canvas_surfaces[\"%s\"]"
".effector_weights",

2
source/blender/makesrna/intern/rna_particle.c
View File

@ -1490,7 +1490,7 @@ static char *rna_ParticleSystem_path(PointerRNA *ptr)
ParticleSystem *psys = (ParticleSystem *)ptr->data;
char name_esc[sizeof(psys->name) * 2];
BLI_strescape(name_esc, psys->name, sizeof(name_esc));
BLI_str_escape(name_esc, psys->name, sizeof(name_esc));
return BLI_sprintfN("particle_systems[\"%s\"]", name_esc);
}

2
source/blender/makesrna/intern/rna_pose.c
View File

@ -132,7 +132,7 @@ static char *rna_PoseBone_path(PointerRNA *ptr)
bPoseChannel *pchan = ptr->data;
char name_esc[sizeof(pchan->name) * 2];
BLI_strescape(name_esc, pchan->name, sizeof(name_esc));
BLI_str_escape(name_esc, pchan->name, sizeof(name_esc));
return BLI_sprintfN("pose.bones[\"%s\"]", name_esc);
}

2
source/blender/makesrna/intern/rna_rna.c
View File

@ -1360,7 +1360,7 @@ static int rna_property_override_diff_propptr(Main *bmain,
BLI_assert(STREQ(rna_itemname_a, rna_itemname_b));
char esc_item_name[RNA_PATH_BUFFSIZE];
const size_t esc_item_name_len = BLI_strescape(
const size_t esc_item_name_len = BLI_str_escape(
esc_item_name, rna_itemname_a, RNA_PATH_BUFFSIZE);
extended_rna_path_len = rna_path_len + 2 + esc_item_name_len + 2;
if (extended_rna_path_len >= RNA_PATH_BUFFSIZE) {

14
source/blender/makesrna/intern/rna_sequencer.c
View File

@ -506,7 +506,7 @@ static char *rna_SequenceTransform_path(PointerRNA *ptr)
if (seq && seq->name + 2) {
char name_esc[(sizeof(seq->name) - 2) * 2];
BLI_strescape(name_esc, seq->name + 2, sizeof(name_esc));
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
return BLI_sprintfN("sequence_editor.sequences_all[\"%s\"].transform", name_esc);
}
else {
@ -558,7 +558,7 @@ static char *rna_SequenceCrop_path(PointerRNA *ptr)
if (seq && seq->name + 2) {
char name_esc[(sizeof(seq->name) - 2) * 2];
BLI_strescape(name_esc, seq->name + 2, sizeof(name_esc));
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
return BLI_sprintfN("sequence_editor.sequences_all[\"%s\"].crop", name_esc);
}
else {
@ -704,7 +704,7 @@ static char *rna_Sequence_path(PointerRNA *ptr)
if (seq->name + 2) {
char name_esc[(sizeof(seq->name) - 2) * 2];
BLI_strescape(name_esc, seq->name + 2, sizeof(name_esc));
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
return BLI_sprintfN("sequence_editor.sequences_all[\"%s\"]", name_esc);
}
else {
@ -1023,7 +1023,7 @@ static char *rna_SequenceColorBalance_path(PointerRNA *ptr)
if (seq && seq->name + 2) {
char name_esc[(sizeof(seq->name) - 2) * 2];
BLI_strescape(name_esc, seq->name + 2, sizeof(name_esc));
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
if (!smd) {
/* path to old filter color balance */
@ -1033,7 +1033,7 @@ static char *rna_SequenceColorBalance_path(PointerRNA *ptr)
/* path to modifier */
char name_esc_smd[sizeof(smd->name) * 2];
BLI_strescape(name_esc_smd, smd->name, sizeof(name_esc_smd));
BLI_str_escape(name_esc_smd, smd->name, sizeof(name_esc_smd));
return BLI_sprintfN("sequence_editor.sequences_all[\"%s\"].modifiers[\"%s\"].color_balance",
name_esc,
name_esc_smd);
@ -1168,8 +1168,8 @@ static char *rna_SequenceModifier_path(PointerRNA *ptr)
char name_esc[(sizeof(seq->name) - 2) * 2];
char name_esc_smd[sizeof(smd->name) * 2];
BLI_strescape(name_esc, seq->name + 2, sizeof(name_esc));
BLI_strescape(name_esc_smd, smd->name, sizeof(name_esc_smd));
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
BLI_str_escape(name_esc_smd, smd->name, sizeof(name_esc_smd));
return BLI_sprintfN(
"sequence_editor.sequences_all[\"%s\"].modifiers[\"%s\"]", name_esc, name_esc_smd);
}

2
source/blender/makesrna/intern/rna_shader_fx.c
View File

@ -161,7 +161,7 @@ static char *rna_ShaderFx_path(PointerRNA *ptr)
ShaderFxData *gmd = ptr->data;
char name_esc[sizeof(gmd->name) * 2];
BLI_strescape(name_esc, gmd->name, sizeof(name_esc));
BLI_str_escape(name_esc, gmd->name, sizeof(name_esc));
return BLI_sprintfN("shader_effects[\"%s\"]", name_esc);
}

2
source/blender/makesrna/intern/rna_texture.c
View File

@ -324,7 +324,7 @@ char *rna_TextureSlot_path(PointerRNA *ptr)
if (mtex->tex) {
char name_esc[(sizeof(mtex->tex->id.name) - 2) * 2];
BLI_strescape(name_esc, mtex->tex->id.name + 2, sizeof(name_esc));
BLI_str_escape(name_esc, mtex->tex->id.name + 2, sizeof(name_esc));
return BLI_sprintfN("texture_slots[\"%s\"]", name_esc);
}
else {

2
source/blender/python/intern/bpy.c
View File

@ -277,7 +277,7 @@ static PyObject *bpy_escape_identifier(PyObject *UNUSED(self), PyObject *value)
size = (value_str_len * 2) + 1;
value_escape_str = PyMem_MALLOC(size);
value_escape_str_len = BLI_strescape(value_escape_str, value_str, size);
value_escape_str_len = BLI_str_escape(value_escape_str, value_str, size);
if (value_escape_str_len == value_str_len) {
Py_INCREF(value);

2
source/blender/sequencer/intern/sequencer.c
View File

@ -505,7 +505,7 @@ static size_t sequencer_rna_path_prefix(char str[SEQ_RNAPATH_MAXSTR], const char
{
char name_esc[SEQ_NAME_MAXSTR * 2];
BLI_strescape(name_esc, name, sizeof(name_esc));
BLI_str_escape(name_esc, name, sizeof(name_esc));
return BLI_snprintf_rlen(
str, SEQ_RNAPATH_MAXSTR, "sequence_editor.sequences_all[\"%s\"]", name_esc);
}