archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix 3D cursor being hidden on existing 2.8 files

Browse Source 
Flip logic for the flag avoids versioning code.
This commit is contained in:
Campbell Barton
2018-05-03 17:56:06 +02:00
parent 7d61803640
commit 656d6f47b9
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -3582,7 +3582,7 @@ class VIEW3D_PT_overlay(Panel):
col = layout.column()
col.active = display_all
col.prop(overlay, "show_3dcursor")
col.prop(overlay, "show_cursor")
if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX'}:
engine_type = {

4
source/blender/blenloader/intern/versioning_280.c
View File

@@ -1068,10 +1068,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
}
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
v3d->overlays |= V3D_OVERLAY_3DCURSOR;
}
}
}
}

2
source/blender/draw/intern/draw_view.c
View File

@@ -615,7 +615,7 @@ static bool is_cursor_visible(const DRWContextState *draw_ctx, Scene *scene, Vie
{
Object *ob = OBACT(view_layer);
View3D *v3d = draw_ctx->v3d;
if ((v3d->flag2 & V3D_RENDER_OVERRIDE) > 0 || (v3d->overlays & V3D_OVERLAY_3DCURSOR) == 0) {
if ((v3d->flag2 & V3D_RENDER_OVERRIDE) > 0 || (v3d->overlays & V3D_OVERLAY_HIDE_CURSOR)) {
return false;
}

2
source/blender/editors/space_view3d/space_view3d.c
View File

@@ -323,7 +323,7 @@ static SpaceLink *view3d_new(const ScrArea *UNUSED(sa), const Scene *scene)
v3d->gridsubdiv = 10;
v3d->drawtype = OB_SOLID;
v3d->drawtype_lighting = V3D_LIGHTING_STUDIO;
v3d->overlays = V3D_OVERLAY_3DCURSOR;
v3d->overlays = 0;
v3d->gridflag = V3D_SHOW_X | V3D_SHOW_Y | V3D_SHOW_FLOOR;

2
source/blender/makesdna/DNA_view3d_types.h
View File

@@ -95,7 +95,7 @@ enum {
enum {
V3D_OVERLAY_FACE_ORIENTATION = (1 << 0),
V3D_OVERLAY_3DCURSOR = (1 << 1),
V3D_OVERLAY_HIDE_CURSOR = (1 << 1),
};
typedef struct RegionView3D {

4
source/blender/makesrna/intern/rna_space.c
View File

@@ -2267,8 +2267,8 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Show Overlays", "Display overlays like manipulators and outlines");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_3dcursor", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "overlays", V3D_OVERLAY_3DCURSOR);
prop = RNA_def_property(srna, "show_cursor", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "overlays", V3D_OVERLAY_HIDE_CURSOR);
RNA_def_property_ui_text(prop, "Show 3D Cursor", "Display 3D Cursor Overlay");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
}