[Bf-blender-cvs] [a3bb385ca0b] blender2.8: Edit Mesh: Move Edit Mesh display settings to overlay's
Clément Foucault
noreply at git.blender.org
Tue Sep 25 22:52:40 CEST 2018
Commit: a3bb385ca0ba37bf1cdc1b74de9ce872b262fb95
Author: Clément Foucault
Date: Mon Sep 24 23:18:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa3bb385ca0ba37bf1cdc1b74de9ce872b262fb95
Edit Mesh: Move Edit Mesh display settings to overlay's
This makes the Edit Mesh display settings common to all objects. They can
also be set differently per viewport.
Modifying extra data (seams, sharp edges etc...) will no longer set them
automaticaly visible.
Bumping version because we need to force set all extra draw options for
older files.
===================================================================
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/modes/edit_mesh_mode.c
M source/blender/draw/modes/edit_mesh_mode_text.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/mesh_data.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/transform/transform_ops.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 552d4802dd1..3c61adc7cac 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -754,7 +754,10 @@ class IMAGE_PT_view_display_uv_edit_overlays(Panel):
col = layout.column()
- col.prop(uvedit, "edge_display_type", text="Edges")
+ split = col.split(factor=0.6)
+ split.prop(uvedit, "show_edges", text="Edges")
+ split.prop(uvedit, "edge_display_type", text="")
+
col.prop(uvedit, "show_faces", text="Faces")
col = layout.column()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index eef9a6d3476..cded9d613ec 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4349,7 +4349,6 @@ class VIEW3D_PT_overlay_edit_mesh(Panel):
overlay = view.overlay
shading = view.shading
display_all = overlay.show_overlays
- data = context.active_object.data
col = layout.column()
col.active = display_all
@@ -4357,18 +4356,18 @@ class VIEW3D_PT_overlay_edit_mesh(Panel):
split = col.split()
sub = split.column()
- sub.prop(data, "show_edges", text="Edges")
+ sub.prop(overlay, "show_edges", text="Edges")
sub = split.column()
- sub.prop(data, "show_faces", text="Faces")
+ sub.prop(overlay, "show_faces", text="Faces")
sub = split.column()
sub.active = shading.show_xray
- sub.prop(data, "show_face_center", text="Center")
+ sub.prop(overlay, "show_face_center", text="Center")
row = col.row(align=True)
- row.prop(data, "show_edge_crease", text="Creases", toggle=True)
- row.prop(data, "show_edge_sharp", text="Sharp", text_ctxt=i18n_contexts.plural, toggle=True)
- row.prop(data, "show_edge_bevel_weight", text="Bevel", toggle=True)
- row.prop(data, "show_edge_seams", text="Seams", toggle=True)
+ row.prop(overlay, "show_edge_crease", text="Creases", toggle=True)
+ row.prop(overlay, "show_edge_sharp", text="Sharp", text_ctxt=i18n_contexts.plural, toggle=True)
+ row.prop(overlay, "show_edge_bevel_weight", text="Bevel", toggle=True)
+ row.prop(overlay, "show_edge_seams", text="Seams", toggle=True)
class VIEW3D_PT_overlay_edit_mesh_shading(Panel):
@@ -4388,7 +4387,6 @@ class VIEW3D_PT_overlay_edit_mesh_shading(Panel):
overlay = view.overlay
tool_settings = context.tool_settings
display_all = overlay.show_overlays
- data = context.active_object.data
statvis = tool_settings.statvis
col = layout.column()
@@ -4402,12 +4400,12 @@ class VIEW3D_PT_overlay_edit_mesh_shading(Panel):
row.label(text="Zero Weights")
row.prop(tool_settings, "vertex_group_user", text="")
- col.prop(data, "show_statvis", text="Mesh Analysis")
- if data.show_statvis:
+ col.prop(overlay, "show_statvis", text="Mesh Analysis")
+ if overlay.show_statvis:
col = col.column()
sub = col.split()
- sub.active = data.show_statvis
+ sub.active = overlay.show_statvis
sub.label(text="Type")
sub.prop(statvis, "type", text="")
@@ -4450,7 +4448,6 @@ class VIEW3D_PT_overlay_edit_mesh_measurement(Panel):
view = context.space_data
overlay = view.overlay
display_all = overlay.show_overlays
- data = context.active_object.data
col = layout.column()
col.active = display_all
@@ -4458,12 +4455,12 @@ class VIEW3D_PT_overlay_edit_mesh_measurement(Panel):
split = col.split()
sub = split.column()
- sub.prop(data, "show_extra_edge_length", text="Edge Length")
- sub.prop(data, "show_extra_edge_angle", text="Edge Angle")
+ sub.prop(overlay, "show_extra_edge_length", text="Edge Length")
+ sub.prop(overlay, "show_extra_edge_angle", text="Edge Angle")
sub = split.column()
- sub.prop(data, "show_extra_face_area", text="Face Area")
- sub.prop(data, "show_extra_face_angle", text="Face Angle")
+ sub.prop(overlay, "show_extra_face_area", text="Face Area")
+ sub.prop(overlay, "show_extra_face_angle", text="Face Angle")
class VIEW3D_PT_overlay_edit_mesh_normals(Panel):
@@ -4512,14 +4509,13 @@ class VIEW3D_PT_overlay_edit_mesh_freestyle(Panel):
view = context.space_data
overlay = view.overlay
display_all = overlay.show_overlays
- data = context.active_object.data
col = layout.column()
col.active = display_all
row = col.row()
- row.prop(data, "show_freestyle_edge_marks", text="Edge Marks")
- row.prop(data, "show_freestyle_face_marks", text="Face Marks")
+ row.prop(overlay, "show_freestyle_edge_marks", text="Edge Marks")
+ row.prop(overlay, "show_freestyle_face_marks", text="Face Marks")
class VIEW3D_PT_overlay_edit_mesh_developer(Panel):
@@ -4538,12 +4534,11 @@ class VIEW3D_PT_overlay_edit_mesh_developer(Panel):
view = context.space_data
overlay = view.overlay
display_all = overlay.show_overlays
- data = context.active_object.data
col = layout.column()
col.active = display_all
- col.prop(data, "show_extra_indices", text="Indices")
+ col.prop(overlay, "show_extra_indices", text="Indices")
class VIEW3D_PT_overlay_edit_curve(Panel):
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 6d41abe1a14..7ac59d6c9d4 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -28,7 +28,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 280
-#define BLENDER_SUBVERSION 23
+#define BLENDER_SUBVERSION 24
/* Several breakages with 280, e.g. collections vs layers */
#define BLENDER_MINVERSION 280
#define BLENDER_MINSUBVERSION 0
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 76986b8c61c..93764ac5f78 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2536,10 +2536,13 @@ static void editbmesh_calc_modifiers(
#if 0 /* XXX Will re-enable this when we have global mod stack options. */
const bool do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol;
#endif
+#if 0 /* Obsolete by 2.8. */
const bool do_final_wmcol = false;
const bool do_init_wmcol = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) && !do_final_wmcol);
-
const bool do_init_statvis = ((((Mesh *)ob->data)->drawflag & ME_DRAW_STATVIS) && !do_init_wmcol);
+#endif
+ const bool do_init_wmcol = false;
+ const bool do_init_statvis = false;
const bool do_mod_wmcol = do_init_wmcol;
VirtualModifierData virtualModifierData;
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 6e555ac1f96..9e1713dc805 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -262,8 +262,6 @@ void BKE_editmesh_lnorspace_update(BMEditMesh *em)
Mesh *me = em->ob->data;
if (me->flag & ME_AUTOSMOOTH) {
BM_edges_sharp_from_angle_set(bm, me->smoothresh);
-
- me->drawflag |= ME_DRAWSHARP;
}
}
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index d59fa3ece60..374365cc58a 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -508,7 +508,7 @@ void BKE_mesh_init(Mesh *me)
#if 0
me->flag = ME_TWOSIDED;
#endif
- me->drawflag = ME_DRAWEDGES | ME_DRAWFACES | ME_DRAWCREASES;
+ me->drawflag = 0;
CustomData_reset(&me->vdata);
CustomData_reset(&me->edata);
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 4b628bf816a..390fa460a55 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -637,7 +637,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
Base *base;
Material *ma;
Camera *cam;
- Mesh *me;
Curve *cu;
Scene *sce;
Tex *tx;
@@ -729,10 +728,12 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
}
}
+#if 0 /* ME_DRAWEDGES and others was moved to viewport. */
/* copy standard draw flag to meshes(used to be global, is not available here) */
for (me = bmain->mesh.first; me; me = me->id.next) {
- me->drawflag = ME_DRAWEDGES|ME_DRAWFACES|ME_DRAWCREASES;
+ me->drawflag = ME_DRAWEDGES | ME_DRAWFACES | ME_DRAWCREASES;
}
+#endif
/* particle draw and render types */
for (part = bmain->particle.first; part; part = part->id.next) {
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 2e261ee2e03..f292cc56f73 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2052,4 +2052,24 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
+
+ if (!MAIN_VERSION_ATLEAST(bmain, 280, 24)) {
+ for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
+ for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+ for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+ if (sl->spacetype == SPACE_VIEW3D) {
+ View3D *v3d = (View3D *)sl;
+ v3d->overlay.edit_flag |= V3D_OVERLAY_EDIT_FACES |
+ V3D_OVERLAY_EDIT_SEAMS |
+ V3D_OVERLAY_EDIT_SHARP |
+ V3D_OVERLAY_EDIT_FREESTYLE_EDGE |
+ V3D_OVERLAY_EDIT_FREESTYLE_FACE |
+ V3D_OVERLAY_ED
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list