Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk...
[blender-staging.git] / source / blender / editors / space_buttons / buttons_context.c
index da19182896b210452e7e67fc31fa89522912f2c3..1e8f3417213de69dc32d831b7f4c95dd8fa25dd9 100644 (file)
@@ -962,6 +962,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout)
        block= uiLayoutGetBlock(row);
        uiBlockSetEmboss(block, UI_EMBOSSN);
        but= uiDefIconButBitC(block, ICONTOG, SB_PIN_CONTEXT, 0, ICON_UNPINNED, 0, 0, UI_UNIT_X, UI_UNIT_Y, &sbuts->flag, 0, 0, 0, 0, "Follow context or keep fixed datablock displayed");
+       uiButClearFlag(but, UI_BUT_UNDO); /* skip undo on screen buttons */
        uiButSetFunc(but, pin_cb, NULL, NULL);
 
        for(a=0; a<path->len; a++) {