[Bf-blender-cvs] [6a8ad00bccd] master: Cleanup: Avoid possible NULL pointer error
Antonio Vazquez
noreply at git.blender.org
Tue Jan 18 13:44:48 CET 2022
Commit: 6a8ad00bccdf5cf8e52991e1ca17b12db7b1bab2
Author: Antonio Vazquez
Date: Tue Jan 18 13:44:27 2022 +0100
Branches: master
https://developer.blender.org/rB6a8ad00bccdf5cf8e52991e1ca17b12db7b1bab2
Cleanup: Avoid possible NULL pointer error
In normal conditions, `gpf` always has a value, but better move inside the NULL checking.
===================================================================
M source/blender/editors/gpencil/editaction_gpencil.c
===================================================================
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c
index e1907dd1514..3cc47198cbc 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -454,9 +454,10 @@ bool ED_gpencil_anim_copybuf_paste(bAnimContext *ac, const short offset_mode)
/* get frame to copy data into (if no frame returned, then just ignore) */
gpf = BKE_gpencil_layer_frame_get(gpld, gpfs->framenum, GP_GETFRAME_ADD_NEW);
- /* Ensure to use same keyframe type. */
- gpf->key_type = gpfs->key_type;
if (gpf) {
+ /* Ensure to use same keyframe type. */
+ gpf->key_type = gpfs->key_type;
+
bGPDstroke *gps, *gpsn;
/* This should be the right frame... as it may be a pre-existing frame,
More information about the Bf-blender-cvs
mailing list