Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-17 05:21:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-17 05:55:06 +0300
commitd72d2d4133ba578ee29e65cc99b01fab0ded0265 (patch)
tree431f413aa00fd1727a888af1f3c55d46bd02b68d /source/blender/editors/space_view3d
parent9149e8942107343fb31639406124428e6ff1a029 (diff)
DNA: clear / remove deprecated flags
- Clear deprecated flags for ID's: Scene, Sequence, World, Object & Mesh. - Clear deprecated flags for Spaces: outliner, 3D view & image. - Remove unused `Mesh.drawflag` - Remove unused `USER_ALLWINCODECS`, `USER_MMB_PASTE`. - Remove `V3D_SOLID_TEX` & `V3D_ZBUF_SELECT` - used in a few areas. - Flip `Object.empty_image_visibility_flag` (avoids do-version on each new flag) - Rename 'Backside' -> 'Back' in context of drawing - showing 'Back' makes sense.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/drawobject.c6
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c5
-rw-r--r--source/blender/editors/space_view3d/view3d_draw_legacy.c4
3 files changed, 2 insertions, 13 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index bb574874cad..409f0300530 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -73,16 +73,10 @@ static bool check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
if (G.f & G_BACKBUFSEL)
return false;
- if ((vd->flag & V3D_ZBUF_SELECT) == 0)
- return true;
-
/* if its drawing textures with zbuf sel, then don't draw dots */
if (dt == OB_TEXTURE && vd->shading.type == OB_TEXTURE)
return false;
- if ((vd->shading.type >= OB_SOLID) && (vd->flag2 & V3D_SOLID_TEX))
- return false;
-
return true;
}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 05debeef88d..9fee8f38533 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1424,7 +1424,7 @@ void ED_view3d_draw_offscreen(
/* set flags */
G.f |= G_RENDER_OGL;
- if ((v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
+ {
/* free images which can have changed on frame-change
* warning! can be slow so only free animated images - campbell */
GPU_free_images_anim(G.main); /* XXX :((( */
@@ -1679,9 +1679,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
if (draw_flags & V3D_OFSDRAW_USE_GPENCIL) {
v3d.flag2 |= V3D_SHOW_ANNOTATION;
}
- if (draw_flags & V3D_OFSDRAW_USE_SOLID_TEX) {
- v3d.flag2 |= V3D_SOLID_TEX;
- }
v3d.shading.background_type = V3D_SHADING_BACKGROUND_WORLD;
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index f51a46cd95f..c9a6a9d608b 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -893,9 +893,7 @@ CustomDataMask ED_view3d_datamask(const Scene *UNUSED(scene), const View3D *v3d)
CustomDataMask mask = 0;
const int drawtype = view3d_effective_drawtype(v3d);
- if (ELEM(drawtype, OB_TEXTURE, OB_MATERIAL) ||
- ((drawtype == OB_SOLID) && (v3d->flag2 & V3D_SOLID_TEX)))
- {
+ if (ELEM(drawtype, OB_TEXTURE, OB_MATERIAL)) {
mask |= CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL;
if (drawtype == OB_MATERIAL)