[Bf-blender-cvs] [37fea2c0f0b] blender2.8: Edit Mode: Merge Xray and "Limit selection to visible" options behaviour
Clément Foucault
noreply at git.blender.org
Fri Sep 21 16:08:17 CEST 2018
Commit: 37fea2c0f0bb57b91595784af57d89259e9301ba
Author: Clément Foucault
Date: Fri Sep 21 15:44:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB37fea2c0f0bb57b91595784af57d89259e9301ba
Edit Mode: Merge Xray and "Limit selection to visible" options behaviour
We now treat Xray as being the mode where Limit selection to visible is off.
If Xray is OFF, Limit selection to visible is considered ON.
To allow 'see through wires' with solid shading (not Xray shading) we still
draw solid shading if Xray is ON with Xray Alpha set to 1.0.
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/edit_mesh_mode.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 095bac456d2..00b96912ceb 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -55,15 +55,6 @@ class VIEW3D_HT_header(Header):
row = layout.row()
row.prop(tool_settings.particle_edit, "select_mode", text="", expand=True)
- # Occlude geometry
- if (
- (((shading.type not in {'SOLID', 'TEXTURED'}) or not shading.show_xray) and
- (object_mode == 'PARTICLE_EDIT' or (object_mode == 'EDIT' and obj.type == 'MESH'))) or
- (object_mode in {'WEIGHT_PAINT', 'VERTEX_PAINT'})
- ):
- row = layout.row()
- row.prop(view, "use_occlude_geometry", text="")
-
# Pose
if obj and object_mode == 'POSE':
row = layout.row(align=True)
@@ -4053,7 +4044,9 @@ class VIEW3D_PT_shading_color(Panel):
layout.row().prop(shading, "background_color", text="")
def draw(self, context):
- self._draw_color_type(context)
+ shading = VIEW3D_PT_shading.get_shading(context)
+ if shading.type != 'WIREFRAME':
+ self._draw_color_type(context)
self._draw_background_color(context)
@@ -4063,11 +4056,6 @@ class VIEW3D_PT_shading_options(Panel):
bl_label = "Options"
bl_parent_id = 'VIEW3D_PT_shading'
- @classmethod
- def poll(cls, context):
- shading = VIEW3D_PT_shading.get_shading(context)
- return shading.type in {'WIREFRAME', 'SOLID'}
-
def draw(self, context):
layout = self.layout
@@ -4113,15 +4101,16 @@ class VIEW3D_PT_shading_options(Panel):
text=""
)
- row = layout.split()
- row.prop(shading, "show_object_outline")
- sub = row.row()
- sub.active = shading.show_object_outline
- sub.prop(shading, "object_outline_color", text="")
+ if shading.type in {'SOLID', 'WIREFRAME'}:
+ row = layout.split()
+ row.prop(shading, "show_object_outline")
+ sub = row.row()
+ sub.active = shading.show_object_outline
+ sub.prop(shading, "object_outline_color", text="")
- col = layout.column()
- if shading.light not in {'WIREFRAME', 'MATCAP'}:
- col.prop(shading, "show_specular_highlight")
+ col = layout.column()
+ if (shading.light is not 'MATCAP') and (shading.type is not 'WIREFRAME'):
+ col.prop(shading, "show_specular_highlight")
class VIEW3D_PT_shading_options_shadow(Panel):
@@ -4365,6 +4354,7 @@ class VIEW3D_PT_overlay_edit_mesh(Panel):
view = context.space_data
overlay = view.overlay
+ shading = view.shading
display_all = overlay.show_overlays
data = context.active_object.data
@@ -4378,7 +4368,7 @@ class VIEW3D_PT_overlay_edit_mesh(Panel):
sub = split.column()
sub.prop(data, "show_faces", text="Faces")
sub = split.column()
- sub.active = view.use_occlude_geometry
+ sub.active = shading.show_xray
sub.prop(data, "show_face_center", text="Center")
row = col.row(align=True)
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 2e0de3b903b..aaad7a8c7a9 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -592,4 +592,6 @@ typedef struct DRWContextState {
const DRWContextState *DRW_context_state_get(void);
+#define XRAY_ENABLED(v3d) ((((v3d)->shading.flag & V3D_SHADING_XRAY) != 0) && ((v3d)->shading.xray_alpha < 1.0f))
+
#endif /* __DRW_RENDER_H__ */
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 73e2c4920b8..36c2497291f 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1160,7 +1160,7 @@ static void drw_engines_enable_external(void)
/* TODO revisit this when proper layering is implemented */
/* Gather all draw engines needed and store them in DST.enabled_engines
* That also define the rendering order of engines */
-static void drw_engines_enable_from_engine(RenderEngineType *engine_type, int drawtype, int shading_flags)
+static void drw_engines_enable_from_engine(RenderEngineType *engine_type, int drawtype, bool use_xray)
{
switch (drawtype) {
case OB_WIRE:
@@ -1168,7 +1168,7 @@ static void drw_engines_enable_from_engine(RenderEngineType *engine_type, int dr
break;
case OB_SOLID:
- if (shading_flags & V3D_SHADING_XRAY) {
+ if (use_xray) {
use_drw_engine(&draw_engine_workbench_transparent);
}
else {
@@ -1288,8 +1288,9 @@ static void drw_engines_enable(ViewLayer *view_layer, RenderEngineType *engine_t
const int mode = CTX_data_mode_enum_ex(DST.draw_ctx.object_edit, obact, DST.draw_ctx.object_mode);
View3D * v3d = DST.draw_ctx.v3d;
const int drawtype = v3d->shading.type;
+ const bool use_xray = XRAY_ENABLED(v3d);
- drw_engines_enable_from_engine(engine_type, drawtype, v3d->shading.flag);
+ drw_engines_enable_from_engine(engine_type, drawtype, use_xray);
if (DRW_state_draw_support()) {
/* Draw paint modes first so that they are drawn below the wireframes. */
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index 30049bd701a..4cf99ef3c1e 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -393,9 +393,7 @@ static void EDIT_MESH_cache_init(void *vedata)
stl->g_data->do_faces = true;
stl->g_data->do_edges = true;
- const bool xray_enabled = ((draw_ctx->v3d->shading.flag & V3D_SHADING_XRAY) != 0) &&
- (draw_ctx->v3d->shading.type < OB_MATERIAL);
- stl->g_data->do_zbufclip = ((v3d->flag & V3D_ZBUF_SELECT) == 0) || xray_enabled;
+ stl->g_data->do_zbufclip = ((v3d)->shading.flag & V3D_SHADING_XRAY) != 0;
/* Applies on top of the theme edge width, so edge-mode can have thick edges. */
stl->g_data->edge_width_scale = (tsettings->selectmode & (SCE_SELECT_EDGE)) ? 1.75f : 1.0f;
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index a9e0992016e..bea32cc1af1 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -279,6 +279,8 @@ typedef struct OBJECT_PrivateData {
int id_ofs_prb_active;
int id_ofs_prb_select;
int id_ofs_prb_transform;
+
+ bool xray_enabled;
} OBJECT_PrivateData; /* Transient data */
static struct {
@@ -934,8 +936,6 @@ static void OBJECT_cache_init(void *vedata)
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
OBJECT_PrivateData *g_data;
const DRWContextState *draw_ctx = DRW_context_state_get();
- const bool xray_enabled = ((draw_ctx->v3d->shading.flag & V3D_SHADING_XRAY) != 0) &&
- (draw_ctx->v3d->shading.type < OB_MATERIAL);
/* TODO : use dpi setting for enabling the second pass */
const bool do_outline_expand = false;
@@ -945,6 +945,7 @@ static void OBJECT_cache_init(void *vedata)
}
g_data = stl->g_data;
+ g_data->xray_enabled = XRAY_ENABLED(draw_ctx->v3d) && (draw_ctx->v3d->shading.type < OB_MATERIAL);
{
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_WIRE;
@@ -952,7 +953,7 @@ static void OBJECT_cache_init(void *vedata)
GPUShader *sh = e_data.outline_prepass_sh;
- if (xray_enabled) {
+ if (g_data->xray_enabled) {
sh = e_data.outline_prepass_wire_sh;
}
@@ -990,14 +991,14 @@ static void OBJECT_cache_init(void *vedata)
DRWState state = DRW_STATE_WRITE_COLOR;
struct GPUBatch *quad = DRW_cache_fullscreen_quad_get();
/* Don't occlude the "outline" detection pass if in xray mode (too much flickering). */
- float alphaOcclu = (xray_enabled) ? 1.0f : 0.35f;
+ float alphaOcclu = (g_data->xray_enabled) ? 1.0f : 0.35f;
/* Reminder : bool uniforms need to be 4 bytes. */
static const int bTrue = true;
static const int bFalse = false;
psl->outlines_search = DRW_pass_create("Outlines Detect Pass", state);
- GPUShader *sh = (xray_enabled) ? e_data.outline_detect_wire_sh : e_data.outline_detect_sh;
+ GPUShader *sh = (g_data->xray_enabled) ? e_data.outline_detect_wire_sh : e_data.outline_detect_sh;
DRWShadingGroup *grp = DRW_shgroup_create(sh, psl->outlines_search);
DRW_shgroup_uniform_texture_ref(grp, "outlineId", &e_data.outlines_id_tx);
DRW_shgroup_uniform_texture_ref(grp, "outlineDepth", &e_data.outlines_depth_tx);
@@ -2636,8 +2637,6 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
if (do_outlines) {
if (!BKE_object_is_in_editmode(ob) && !((ob == draw_ctx->obact) && (draw_ctx->object_mode & OB_MODE_ALL_PAINT))) {
struct GPUBatch *geom;
- const bool xray_enabled = ((v3d->shading.flag & V3D_SHADING_XRAY) != 0) &&
- (v3d->shading.type < OB_MATERIAL);
/* This fixes only the biggest case which is a plane in ortho view. */
int flat_axis = 0;
@@ -2645,7 +2644,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
DRW_object_is_flat(ob, &flat_axis) &&
DRW_object_axis_orthogonal_to_view(ob, flat_axis);
- if (xray_enabled || is_flat_object_viewed_from_side) {
+ if (stl->g_data->xray_enabled || is_flat_object_viewed_from_side) {
geom = DRW_cache_object_edge_detection_get(ob, NULL);
}
else {
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 30daaad3c2c..605c9bc3d97 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -536,7 +536,7 @@ void ED_view3d_stop_render_preview(struct wmWindowManager *wm, struct ARegion *a
void ED_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrArea *sa);
#define V3D_IS_ZBUF(v3d) \
- (((v3d)->flag & V3D_ZBUF_SELECT) && ((v3d)->shading.type > OB_WIRE))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list