[Bf-blender-cvs] [8b3afb178a7] greasepencil-object: GPencil: Fix double definition
Antonioya
noreply at git.blender.org
Wed Jul 10 17:40:59 CEST 2019
Commit: 8b3afb178a720e9305666afd00bb876dfed17c9d
Author: Antonioya
Date: Wed Jul 10 17:37:33 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8b3afb178a720e9305666afd00bb876dfed17c9d
GPencil: Fix double definition
The gpl was out of scope due double definition.
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 99f9419de9f..d656d2d0a16 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2170,7 +2170,7 @@ void BKE_gpencil_convert_curve(Main *bmain,
}
if (gpl == NULL) {
- bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
+ gpl = BKE_gpencil_layer_getactive(gpd);
if (gpl == NULL) {
gpl = BKE_gpencil_layer_addnew(gpd, DATA_("GP_Layer"), true);
}
More information about the Bf-blender-cvs
mailing list