diff options
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_vertex_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_vertex_ops.c b/source/blender/editors/gpencil/gpencil_vertex_ops.c index 4db88bd552f..7f51ec02b65 100644 --- a/source/blender/editors/gpencil/gpencil_vertex_ops.c +++ b/source/blender/editors/gpencil/gpencil_vertex_ops.c @@ -434,7 +434,7 @@ static int gp_vertexpaint_set_exec(bContext *C, wmOperator *op) Object *ob = CTX_data_active_object(C); bGPdata *gpd = (bGPdata *)ob->data; Paint *paint = &ts->gp_vertexpaint->paint; - Brush *brush = brush = paint->brush; + Brush *brush = paint->brush; bool changed = false; int i; diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index a87863bca41..d696c99851b 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1452,8 +1452,8 @@ void UI_view2d_scrollers_calc(View2D *v2d, vert.xmax -= smaller; } - CLAMP(vert.ymin, vert.ymin, vert.ymax - V2D_SCROLL_HANDLE_SIZE_HOTSPOT); - CLAMP(hor.xmin, hor.xmin, hor.xmax - V2D_SCROLL_HANDLE_SIZE_HOTSPOT); + CLAMP_MAX(vert.ymin, vert.ymax - V2D_SCROLL_HANDLE_SIZE_HOTSPOT); + CLAMP_MAX(hor.xmin, hor.xmax - V2D_SCROLL_HANDLE_SIZE_HOTSPOT); /* store in scrollers, used for drawing */ r_scrollers->vert = vert; |