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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-07-03 04:02:45 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-07-03 04:02:45 +0400
commit98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch)
tree47455f2482f6eca0352c10c57482641eec6afb57 /source/blender/editors/gpencil/gpencil_buttons.c
parent4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff)
parent2ed69a95f499081aacc15c0295f3461c38430554 (diff)
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_buttons.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_buttons.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c
index dabc0ad1081..d90ec02b0c1 100644
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@ -126,7 +126,7 @@ static void gp_drawui_layer(uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl, cons
block = uiLayoutGetBlock(sub);
icon = (gpl->flag & GP_LAYER_ACTIVE) ? ICON_RADIOBUT_ON : ICON_RADIOBUT_OFF;
but = uiDefIconButBitI(block, TOG, GP_LAYER_ACTIVE, 0, icon, 0, 0, UI_UNIT_X, UI_UNIT_Y,
- &gpd->flag, 0.0, 0.0, 0.0, 0.0, TIP_("Set active layer"));
+ &gpl->flag, 0.0, 0.0, 0.0, 0.0, TIP_("Set active layer"));
uiButSetFunc(but, gp_ui_activelayer_cb, gpd, gpl);
/* locked */