Commit: 189e89769f259fcef02979888a489a34f0a10ed7
Author: Joshua Leung
Date:   Wed Nov 12 01:32:29 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rB189e89769f259fcef02979888a489a34f0a10ed7

Merge branch 'master' into GPencil_EditStrokes

Conflicts:
        source/blender/editors/gpencil/gpencil_buttons.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_buttons.c
index 6d740ce,a7635c1..fe033c4
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@@@ -145,12 -145,13 +145,12 @@@ static void gp_drawui_layer(uiLayout *l
        /* active */
        block = uiLayoutGetBlock(sub);
        icon = (gpl->flag & GP_LAYER_ACTIVE) ? ICON_RADIOBUT_ON : 
ICON_RADIOBUT_OFF;
-       but = uiDefIconButBitS(block, TOG, GP_LAYER_ACTIVE, 0, icon, 0, 0, 
UI_UNIT_X, UI_UNIT_Y,
 -      but = uiDefIconButBitI(block, UI_BTYPE_TOGGLE, GP_LAYER_ACTIVE, 0, 
icon, 0, 0, UI_UNIT_X, UI_UNIT_Y,
++      but = uiDefIconButBitS(block, UI_BTYPE_TOGGLE, GP_LAYER_ACTIVE, 0, 
icon, 0, 0, UI_UNIT_X, UI_UNIT_Y,
                               &gpl->flag, 0.0, 0.0, 0.0, 0.0, TIP_("Set active 
layer"));
-       uiButSetFunc(but, gp_ui_activelayer_cb, gpd, gpl);
+       UI_but_func_set(but, gp_ui_activelayer_cb, gpd, gpl);
        
        /* locked */
 -      icon = (gpl->flag & GP_LAYER_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED;
 -      uiItemR(sub, &ptr, "lock", 0, "", icon);
 +      uiItemR(sub, &ptr, "lock", 0, "", ICON_NONE);
        
        /* when layer is locked or hidden, only draw header */
        if (gpl->flag & (GP_LAYER_LOCKED | GP_LAYER_HIDE)) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to