[Bf-blender-cvs] [df8a9648e2e] master: Cleanup: remove redundant sequencer name checks
Campbell Barton
noreply at git.blender.org
Wed May 18 10:08:49 CEST 2022
Commit: df8a9648e2e349f9c673bf112285770cec6cb197
Author: Campbell Barton
Date: Wed May 18 17:45:14 2022 +1000
Branches: master
https://developer.blender.org/rBdf8a9648e2e349f9c673bf112285770cec6cb197
Cleanup: remove redundant sequencer name checks
The `seq->name + 2` check dates back to 2009 [0] but does nothing.
[0]: 6e0c1cd4e5acaa91adbfd2137709a6803647cde7
===================================================================
M source/blender/makesrna/intern/rna_sequencer.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 51f62b62c8e..3f371188578 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -528,7 +528,7 @@ static char *rna_SequenceTransform_path(PointerRNA *ptr)
Editing *ed = SEQ_editing_get(scene);
Sequence *seq = sequence_get_by_transform(ed, ptr->data);
- if (seq && seq->name + 2) {
+ if (seq) {
char name_esc[(sizeof(seq->name) - 2) * 2];
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
@@ -580,7 +580,7 @@ static char *rna_SequenceCrop_path(PointerRNA *ptr)
Editing *ed = SEQ_editing_get(scene);
Sequence *seq = sequence_get_by_crop(ed, ptr->data);
- if (seq && seq->name + 2) {
+ if (seq) {
char name_esc[(sizeof(seq->name) - 2) * 2];
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
@@ -725,15 +725,10 @@ static char *rna_Sequence_path(PointerRNA *ptr)
/* sequencer data comes from scene...
* TODO: would be nice to make SequenceEditor data a data-block of its own (for shorter paths)
*/
- if (seq->name + 2) {
- char name_esc[(sizeof(seq->name) - 2) * 2];
+ char name_esc[(sizeof(seq->name) - 2) * 2];
- BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
- return BLI_sprintfN("sequence_editor.sequences_all[\"%s\"]", name_esc);
- }
- else {
- return BLI_strdup("");
- }
+ BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
+ return BLI_sprintfN("sequence_editor.sequences_all[\"%s\"]", name_esc);
}
static IDProperty **rna_Sequence_idprops(PointerRNA *ptr)
@@ -1064,7 +1059,7 @@ static char *rna_SequenceColorBalance_path(PointerRNA *ptr)
Editing *ed = SEQ_editing_get(scene);
Sequence *seq = sequence_get_by_colorbalance(ed, ptr->data, &smd);
- if (seq && seq->name + 2) {
+ if (seq) {
char name_esc[(sizeof(seq->name) - 2) * 2];
BLI_str_escape(name_esc, seq->name + 2, sizeof(name_esc));
@@ -1208,7 +1203,7 @@ static char *rna_SequenceModifier_path(PointerRNA *ptr)
SequenceModifierData *smd = ptr->data;
Sequence *seq = sequence_get_by_modifier(ed, smd);
- if (seq && seq->name + 2) {
+ if (seq) {
char name_esc[(sizeof(seq->name) - 2) * 2];
char name_esc_smd[sizeof(smd->name) * 2];
More information about the Bf-blender-cvs
mailing list