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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-01-18 17:56:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-18 17:56:04 +0300
commitb059a7165549893f629ed189622745e675659d53 (patch)
treeaf7d2461e39ded6aa116f5973ec20df492b82931 /source/blender/editors
parent6d868d9f48a35a0576e9e4e7b6442bdc0fc8d282 (diff)
GPencil: Avoid variable shadowing
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/gpencil/gpencil_edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 8470cd78d91..3ac085e23d7 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);
}