From 2d0d4e7de4d31bd2f8485a9b7b4311bf8e254c3d Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Sun, 1 Nov 2009 00:06:53 +0000 Subject: commit before doing some hefty shapekey change, will break compilation --- source/blender/editors/space_view3d/view3d_header.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/space_view3d/view3d_header.c') diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 95900e6faa3..2cc58f71a58 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -179,12 +179,12 @@ static void handle_view3d_lock(bContext *C) if (v3d != NULL && sa != NULL) { if(v3d->localvd==NULL && v3d->scenelock && sa->spacetype==SPACE_VIEW3D) { - /* copy to scene */ scene->lay= v3d->lay; scene->camera= v3d->camera; - //copy_view3d_lock(REDRAW); + /* notifiers for scene update */ + WM_event_add_notifier(C, NC_SCENE, scene); } } } @@ -1819,6 +1819,7 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event) ED_area_tag_redraw(sa); break; case B_VIEW_BUTSEDIT: + ED_area_tag_redraw(sa); break; default: @@ -2029,7 +2030,8 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) } } else { if (obedit==NULL && ((ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)))) { - uiDefIconButBitI(block, TOG, G_FACESELECT, B_VIEW_BUTSEDIT, ICON_FACESEL_HLT,xco,yco,XIC,YIC, &G.f, 0, 0, 0, 0, "Painting Mask (FKey)"); + Mesh *me= ob->data; + uiDefIconButBitS(block, TOG, ME_EDIT_PAINT_MASK, B_VIEW_BUTSEDIT, ICON_FACESEL_HLT,xco,yco,XIC,YIC, &me->editflag, 0, 0, 0, 0, "Painting Mask (FKey)"); header_xco_step(ar, &xco, &yco, &maxco, XIC+10); } else { /* Manipulators aren't used in weight paint mode */ @@ -2200,6 +2202,9 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) uiDefIconBut(block, BUT, B_VIEWRENDER, ICON_SCENE, xco,yco,XIC,YIC, NULL, 0, 1.0, 0, 0, "Render this window (Ctrl Click for anim)"); if (ob && (ob->mode & OB_MODE_POSE)) { + PointerRNA *but_ptr; + uiBut *but; + xco+= XIC*2; uiBlockBeginAlign(block); @@ -2209,8 +2214,9 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) uiDefIconButO(block, BUT, "POSE_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_PASTEDOWN, xco,yco,XIC,YIC, NULL); xco+= XIC; - // FIXME: this needs an extra arg... - uiDefIconButO(block, BUT, "POSE_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_PASTEFLIPDOWN, xco,yco,XIC,YIC, NULL); + but=uiDefIconButO(block, BUT, "POSE_OT_paste", WM_OP_INVOKE_REGION_WIN, ICON_PASTEFLIPDOWN, xco,yco,XIC,YIC, NULL); + but_ptr= uiButGetOperatorPtrRNA(but); + RNA_boolean_set(but_ptr, "flipped", 1); uiBlockEndAlign(block); header_xco_step(ar, &xco, &yco, &maxco, XIC); -- cgit v1.2.3