Commit: 2198cd5067f18eb527f4bdc19c675c7827ab9c7d Author: Antonioya Date: Sat Jul 28 20:41:04 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB2198cd5067f18eb527f4bdc19c675c7827ab9c7d
Cleanup: Move view settings to overlay struct =================================================================== M source/blender/blenloader/intern/versioning_280.c M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c M source/blender/draw/engines/gpencil/gpencil_engine.c M source/blender/editors/space_view3d/space_view3d.c M source/blender/makesdna/DNA_view3d_types.h M source/blender/makesrna/intern/rna_space.c =================================================================== diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 65043b0afb5..64efd260f6f 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -989,11 +989,11 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; - v3d->gpencil_grid_scale = 1.0f; // Scale - v3d->gpencil_grid_lines = GP_DEFAULT_GRID_LINES; // NUmber of lines - v3d->gpencil_paper_opacity = 0.5f; - v3d->gpencil_grid_axis = V3D_GP_GRID_AXIS_Y; - v3d->gpencil_grid_opacity = 0.9f; + v3d->overlay.gpencil_grid_scale = 1.0f; // Scale + v3d->overlay.gpencil_grid_lines = GP_DEFAULT_GRID_LINES; // NUmber of lines + v3d->overlay.gpencil_paper_opacity = 0.5f; + v3d->overlay.gpencil_grid_axis = V3D_GP_GRID_AXIS_Y; + v3d->overlay.gpencil_grid_opacity = 0.9f; } } } diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c index 77e55861bf6..e60293a6d03 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c @@ -641,26 +641,26 @@ GPUBatch *DRW_gpencil_get_grid(void) float col_grid[4]; /* verify we have something to draw and valid values */ - if (v3d->gpencil_grid_lines < 4) { - v3d->gpencil_grid_lines = GP_DEFAULT_GRID_LINES; + if (v3d->overlay.gpencil_grid_lines < 4) { + v3d->overlay.gpencil_grid_lines = GP_DEFAULT_GRID_LINES; } - if (v3d->gpencil_grid_scale == 0.0f) { - v3d->gpencil_grid_scale = 1.0f; + if (v3d->overlay.gpencil_grid_scale == 0.0f) { + v3d->overlay.gpencil_grid_scale = 1.0f; } - if (v3d->gpencil_grid_opacity < 0.1f) { - v3d->gpencil_grid_opacity = 0.1f; + if (v3d->overlay.gpencil_grid_opacity < 0.1f) { + v3d->overlay.gpencil_grid_opacity = 0.1f; } UI_GetThemeColor3fv(TH_GRID, col_grid); - col_grid[3] = v3d->gpencil_grid_opacity; + col_grid[3] = v3d->overlay.gpencil_grid_opacity; /* if use locked axis, copy value */ - int axis = v3d->gpencil_grid_axis; - if ((v3d->gpencil_grid_axis & V3D_GP_GRID_AXIS_LOCK) == 0) { + int axis = v3d->overlay.gpencil_grid_axis; + if ((v3d->overlay.gpencil_grid_axis & V3D_GP_GRID_AXIS_LOCK) == 0) { - axis = v3d->gpencil_grid_axis; + axis = v3d->overlay.gpencil_grid_axis; } else { switch (ts->gp_sculpt.lock_axis) { @@ -684,8 +684,8 @@ GPUBatch *DRW_gpencil_get_grid(void) } const char *grid_unit = NULL; - const int gridlines = v3d->gpencil_grid_lines / 2; - const float grid_scale = v3d->gpencil_grid_scale * ED_scene_grid_scale(scene, &grid_unit); + const int gridlines = v3d->overlay.gpencil_grid_lines / 2; + const float grid_scale = v3d->overlay.gpencil_grid_scale * ED_scene_grid_scale(scene, &grid_unit); const float grid = gridlines * grid_scale; const uint vertex_len = 2 * (gridlines * 4 + 2); diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index ed1332d2712..ab2efc283a8 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -429,7 +429,7 @@ void GPENCIL_cache_init(void *vedata) DRWShadingGroup *paper_shgrp = DRW_shgroup_create(e_data.gpencil_paper_sh, psl->paper_pass); DRW_shgroup_call_add(paper_shgrp, quad, NULL); DRW_shgroup_uniform_vec3(paper_shgrp, "color", v3d->shading.background_color, 1); - DRW_shgroup_uniform_float(paper_shgrp, "opacity", &v3d->gpencil_paper_opacity, 1); + DRW_shgroup_uniform_float(paper_shgrp, "opacity", &v3d->overlay.gpencil_paper_opacity, 1); } /* grid pass */ diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index ff563cea353..c1776ef18e7 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -342,11 +342,11 @@ static SpaceLink *view3d_new(const ScrArea *UNUSED(sa), const Scene *scene) v3d->near = 0.01f; v3d->far = 1000.0f; - v3d->gpencil_grid_scale = 1.0; // Scales - v3d->gpencil_grid_lines = GP_DEFAULT_GRID_LINES; // NUmber of Lines - v3d->gpencil_paper_opacity = 0.5f; - v3d->gpencil_grid_axis = V3D_GP_GRID_AXIS_Y; - v3d->gpencil_grid_opacity = 0.9f; + v3d->overlay.gpencil_grid_scale = 1.0; // Scales + v3d->overlay.gpencil_grid_lines = GP_DEFAULT_GRID_LINES; // NUmber of Lines + v3d->overlay.gpencil_paper_opacity = 0.5f; + v3d->overlay.gpencil_grid_axis = V3D_GP_GRID_AXIS_Y; + v3d->overlay.gpencil_grid_opacity = 0.9f; v3d->bundle_size = 0.2f; v3d->bundle_drawtype = OB_PLAINAXES; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 9883587783d..27b07a317ed 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -190,6 +190,14 @@ typedef struct View3DOverlay { float wireframe_threshold; char _pad0[4]; + /* grease pencil setttings */ + float gpencil_grid_scale; + float gpencil_paper_opacity; + int gpencil_grid_lines; + int gpencil_grid_axis; + float gpencil_grid_opacity; + char _pad1[4]; + } View3DOverlay; /* 3D ViewPort Struct */ @@ -267,12 +275,6 @@ typedef struct View3D { /* XXX deprecated? */ struct bGPdata *gpd DNA_DEPRECATED; /* Grease-Pencil Data (annotation layers) */ - float gpencil_grid_scale; - float gpencil_paper_opacity; - int gpencil_grid_lines; - int gpencil_grid_axis; - float gpencil_grid_opacity; - char pad6[4]; /* Stereoscopy settings */ short stereo3d_flag; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 385306bb805..adb7007e664 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2876,27 +2876,27 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "gpencil_grid_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "gpencil_grid_scale"); + RNA_def_property_float_sdna(prop, NULL, "overlay.gpencil_grid_scale"); RNA_def_property_range(prop, 0.01f, FLT_MAX); RNA_def_property_float_default(prop, 1.0f); RNA_def_property_ui_text(prop, "Scale", "Grid scale"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "gpencil_grid_lines", PROP_INT, PROP_NONE); - RNA_def_property_int_sdna(prop, NULL, "gpencil_grid_lines"); + RNA_def_property_int_sdna(prop, NULL, "overlay.gpencil_grid_lines"); RNA_def_property_range(prop, 4, INT_MAX); RNA_def_property_int_default(prop, 20); RNA_def_property_ui_text(prop, "Lines", "Number of lines"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "gpencil_grid_axis", PROP_ENUM, PROP_NONE); - RNA_def_property_enum_sdna(prop, NULL, "gpencil_grid_axis"); + RNA_def_property_enum_sdna(prop, NULL, "overlay.gpencil_grid_axis"); RNA_def_property_enum_items(prop, rna_enum_gpencil_grid_axis_items); RNA_def_property_ui_text(prop, "Axis", "Axis to display grid"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "gpencil_grid_opacity", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "gpencil_grid_opacity"); + RNA_def_property_float_sdna(prop, NULL, "overlay.gpencil_grid_opacity"); RNA_def_property_range(prop, 0.1f, 1.0f); RNA_def_property_float_default(prop, 0.9f); RNA_def_property_ui_text(prop, "Opacity", "Grid opacity"); @@ -2904,7 +2904,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) /* Paper opacity factor */ prop = RNA_def_property(srna, "gpencil_paper_opacity", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "gpencil_paper_opacity"); + RNA_def_property_float_sdna(prop, NULL, "overlay.gpencil_paper_opacity"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_float_default(prop, 0.5f); RNA_def_property_ui_text(prop, "Opacity", "Paper opacity"); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs