Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2021-06-30 09:57:33 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2021-06-30 09:57:33 +0300
commitefe2247e3cdb1006a5b1d87d76a96dc6a63ad12c (patch)
treecc26f1d5b7a52f124f44d0a4da53af89027e4293 /source/blender/editors/gpencil/gpencil_data.c
parenta08ed1dce31f84128828f3107bcd67d3f362271a (diff)
parent8884d2d61b3d60d44d4f8aecaba1d0fd121b0bf3 (diff)
Merge branch 'master' into geometry-nodes-unnamed-attributes
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_data.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_data.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 47bb153cf46..e11ed927cbf 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -2718,9 +2718,8 @@ static void gpencil_joined_fix_animdata_cb(ID *id, FCurve *fcu, void *user_data)
fcu->rna_path = BKE_animsys_fix_rna_path_rename(
id, fcu->rna_path, "layers", old_name, new_name, 0, 0, false);
- /* we don't want to apply a second remapping on this F-Curve now,
- * so stop trying to fix names names
- */
+ /* We don't want to apply a second remapping on this F-Curve now,
+ * so stop trying to fix names. */
break;
}
}