[Bf-blender-cvs] [1f93f9e9820] master: Cleanup: Rename to avoid shadow variable

[Antonio Vazquez]

Commit: 1f93f9e9820890a9389b603df8e3c4623a6f73a5
Author: Antonio Vazquez
Date:   Fri Jun 7 12:49:33 2019 +0200
Branches: master
https://developer.blender.org/rB1f93f9e9820890a9389b603df8e3c4623a6f73a5

Cleanup: Rename to avoid shadow variable

===================================================================

M	source/blender/editors/gpencil/gpencil_data.c

===================================================================

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;
   }