diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:52:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:54:52 +0300 |
| commit | 9342f55d12f87dbc72e6953e0bc6c2564e57465f (patch) | |
| tree | ef3d3baa82c2bbf4badd6f11592237df76c8744e /source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c | |
| parent | 222a941a2bbd71dcaa1012cdea959954ca065c6a (diff) | |
| parent | ecab7bef6989752ff1a8c5fd1eab7b5ab159ed46 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index 72e2e7b323d..7ff9c3851ac 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -183,7 +183,7 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, const wmEvent *even Mesh *me; bool changed = false; - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); me = BKE_mesh_from_object(vc.obact); if (me && me->dvert && vc.v3d && vc.rv3d && (vc.obact->actdef != 0)) { @@ -298,7 +298,7 @@ static const EnumPropertyItem *weight_paint_sample_enum_itemf( ViewContext vc; Mesh *me; - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); me = BKE_mesh_from_object(vc.obact); if (me && me->dvert && vc.v3d && vc.rv3d && vc.obact->defbase.first) { @@ -367,7 +367,7 @@ static int weight_sample_group_exec(bContext *C, wmOperator *op) { int type = RNA_enum_get(op->ptr, "group"); ViewContext vc; - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); BLI_assert(type + 1 >= 0); vc.obact->actdef = type + 1; |