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:
authorAntonio Vazquez <blendergit@gmail.com>2019-06-07 13:49:33 +0300
committerAntonio Vazquez <blendergit@gmail.com>2019-06-07 13:49:56 +0300
commit1f93f9e9820890a9389b603df8e3c4623a6f73a5 (patch)
tree85a2dfa5433a0ec51528c8fec818764327338ade /source/blender/editors/gpencil
parentede4f3196985b2c2508fc1397c642da770f36a8e (diff)
Cleanup: Rename to avoid shadow variable
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r--source/blender/editors/gpencil/gpencil_data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index b2f636122c3..ca5c8ae70e4 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1271,10 +1271,10 @@ static int gp_stroke_arrange_exec(bContext *C, wmOperator *op)
{
Object *ob = CTX_data_active_object(C);
bGPdata *gpd = ED_gpencil_data_get_active(C);
- bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
+ bGPDlayer *gpl_act = BKE_gpencil_layer_getactive(gpd);
/* sanity checks */
- if (ELEM(NULL, gpd, gpl, gpl->actframe)) {
+ if (ELEM(NULL, gpd, gpl_act, gpl_act->actframe)) {
return OPERATOR_CANCELLED;
}