diff options
-rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 7 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 22 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_ops.c | 3 |
4 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 710a9b787a0..99e6e898685 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1564,10 +1564,11 @@ void BKE_pbvh_node_draw(PBVHNode *node, void *data_v) glColor3f(1, 0, 0); #endif - if (!(node->flag & PBVH_FullyHidden)) + if (!(node->flag & PBVH_FullyHidden)) { GPU_draw_buffers(node->draw_buffers, - data->setMaterial, - data->wireframe); + data->setMaterial, + data->wireframe); + } } typedef enum { diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 881b199abe1..89d481eac45 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1752,7 +1752,7 @@ void uiItemMenuEnumO(uiLayout *layout, bContext *C, const char *opname, const ch if (ot->prop && WM_key_event_operator_string(C, ot->idname, layout->root->opcontext, NULL, false, keybuf, sizeof(keybuf))) { - namestr += BLI_snprintf(namestr, sizeof(namestr_buf) - (namestr - namestr_buf) , "|%s", name); + namestr += BLI_snprintf(namestr, sizeof(namestr_buf) - (namestr - namestr_buf), "|%s", name); } } diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 3f9b2aac0f1..49b16a68dfc 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -177,17 +177,17 @@ static int add_marker_at_click_invoke(bContext *C, wmOperator *op, const wmEvent static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) { - SpaceClip *sc = CTX_wm_space_clip(C); - MovieClip *clip = ED_space_clip_get_clip(sc); - ARegion *ar = CTX_wm_region(C); - float pos[2]; + SpaceClip *sc = CTX_wm_space_clip(C); + MovieClip *clip = ED_space_clip_get_clip(sc); + ARegion *ar = CTX_wm_region(C); + float pos[2]; - switch(event->type) { - case MOUSEMOVE: + switch (event->type) { + case MOUSEMOVE: return OPERATOR_RUNNING_MODAL; break; - case LEFTMOUSE: + case LEFTMOUSE: ED_area_headerprint(CTX_wm_area(C), NULL); ED_clip_point_stable_pos(sc, ar, @@ -203,11 +203,11 @@ static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const break; case ESCKEY: - ED_area_headerprint(CTX_wm_area(C), NULL); - return OPERATOR_CANCELLED; - } + ED_area_headerprint(CTX_wm_area(C), NULL); + return OPERATOR_CANCELLED; + } - return OPERATOR_PASS_THROUGH; + return OPERATOR_PASS_THROUGH; } void CLIP_OT_add_marker_at_click(wmOperatorType *ot) diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 7b258e0eafb..04675430339 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -502,8 +502,7 @@ static void txt_write_file(Text *text, ReportList *reports) filepath, errno ? strerror(errno) : TIP_("unknown error stating file")); } - if (text->flags & TXT_ISDIRTY) - text->flags ^= TXT_ISDIRTY; + text->flags &= ~TXT_ISDIRTY; } static int text_save_exec(bContext *C, wmOperator *op) |