diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-03 16:09:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-05 16:54:43 +0300 |
| commit | b365cc017adf3a8fb36006d6cb194d28be02e6d4 (patch) | |
| tree | 9707a02b1ce75c285d731f41a9d49d2ec52dcad8 /source/blender/draw/modes/paint_weight_mode.c | |
| parent | 2094b454474de25e42cd6ec1f63ebc84f50f666a (diff) | |
3D Viewport: move overlay settings from collections to 3D viewport.
For some we may add per object overrides, but for most we plan to keep them
strictly per viewport settings. Display settings from the mesh still need to
be moved here, only collections were done to remove that code.
Diffstat (limited to 'source/blender/draw/modes/paint_weight_mode.c')
| -rw-r--r-- | source/blender/draw/modes/paint_weight_mode.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c index a5a9f355dc6..d7ad3e93af7 100644 --- a/source/blender/draw/modes/paint_weight_mode.c +++ b/source/blender/draw/modes/paint_weight_mode.c @@ -34,6 +34,7 @@ #include "draw_mode_engines.h" #include "DNA_mesh_types.h" +#include "DNA_view3d_types.h" #include "BKE_mesh.h" @@ -176,11 +177,11 @@ static void PAINT_WEIGHT_cache_populate(void *vedata, Object *ob) { PAINT_WEIGHT_StorageList *stl = ((PAINT_WEIGHT_Data *)vedata)->stl; const DRWContextState *draw_ctx = DRW_context_state_get(); + const View3D *v3d = draw_ctx->v3d; if ((ob->type == OB_MESH) && (ob == draw_ctx->obact)) { - IDProperty *ces_mode_pw = BKE_layer_collection_engine_evaluated_get(ob, COLLECTION_MODE_PAINT_WEIGHT, ""); const Mesh *me = ob->data; - const bool use_wire = BKE_collection_engine_property_value_get_bool(ces_mode_pw, "use_wire"); + const bool use_wire = (v3d->overlay.paint_flag & V3D_OVERLAY_PAINT_WIRE) != 0; const bool use_surface = DRW_object_is_mode_shade(ob) == true; const bool use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0; const bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0; @@ -224,15 +225,6 @@ static void PAINT_WEIGHT_engine_free(void) DRW_SHADER_FREE_SAFE(e_data.vert_overlay_shader); } -void PAINT_WEIGHT_collection_settings_create(IDProperty *properties) -{ - BLI_assert(properties && - properties->type == IDP_GROUP && - properties->subtype == IDP_GROUP_SUB_MODE_PAINT_WEIGHT); - - BKE_collection_engine_property_add_bool(properties, "use_wire", false); -} - static const DrawEngineDataSize PAINT_WEIGHT_data_size = DRW_VIEWPORT_DATA_SIZE(PAINT_WEIGHT_Data); DrawEngineType draw_engine_paint_weight_type = { |