[Bf-blender-cvs] [b059a71655] master: GPencil: Avoid variable shadowing

[Sergey Sharybin]

Commit: b059a7165549893f629ed189622745e675659d53
Author: Sergey Sharybin
Date:   Wed Jan 18 15:56:04 2017 +0100
Branches: master
https://developer.blender.org/rBb059a7165549893f629ed189622745e675659d53

GPencil: Avoid variable shadowing

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 8470cd78d9..3ac085e23d 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -707,10 +707,10 @@ static int gp_blank_frame_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Scene *scene = CTX_data_scene(C);
 	bGPdata *gpd = ED_gpencil_data_get_active(C);
-	bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
+	bGPDlayer *active_gpl = BKE_gpencil_layer_getactive(gpd);
 	
 	/* Initialise datablock and an active layer if nothing exists yet */
-	if (ELEM(NULL, gpd, gpl)) {
+	if (ELEM(NULL, gpd, active_gpl)) {
 		/* let's just be lazy, and call the "Add New Layer" operator, which sets everything up as required */
 		WM_operator_name_call(C, "GPENCIL_OT_layer_add", WM_OP_EXEC_DEFAULT, NULL);
 	}