[Bf-blender-cvs] [fcee82d19a7] master: Cleanup: remove unused G_FLAG_BACKBUFSEL

Campbell Barton noreply at git.blender.org
Mon May 20 04:41:10 CEST 2019


Commit: fcee82d19a73539e7f2e6142aeda4621c2b29eef
Author: Campbell Barton
Date:   Mon May 20 12:35:24 2019 +1000
Branches: master
https://developer.blender.org/rBfcee82d19a73539e7f2e6142aeda4621c2b29eef

Cleanup: remove unused G_FLAG_BACKBUFSEL

===================================================================

M	source/blender/blenkernel/BKE_global.h
M	source/blender/editors/space_view3d/view3d_draw_legacy.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 387e7f2182b..9fe8fc3880f 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -107,7 +107,6 @@ typedef struct Global {
 /** #Global.f */
 enum {
   G_FLAG_RENDER_VIEWPORT = (1 << 0),
-  G_FLAG_BACKBUFSEL = (1 << 1),
   G_FLAG_PICKSEL = (1 << 2),
   /** Support simulating events (for testing). */
   G_FLAG_EVENT_SIMULATE = (1 << 3),
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index c17eb5cef81..2ad61314430 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -178,9 +178,6 @@ static void validate_object_select_id(struct Depsgraph *depsgraph,
   else if ((obact_eval && (obact_eval->mode & OB_MODE_PARTICLE_EDIT)) && !XRAY_ENABLED(v3d)) {
     /* do nothing */
   }
-  else if ((obedit && (obedit->mode & OB_MODE_EDIT)) && !XRAY_FLAG_ENABLED(v3d)) {
-    /* do nothing */
-  }
   else {
     v3d->flag &= ~V3D_INVALID_BACKBUF;
     return;
@@ -190,23 +187,6 @@ static void validate_object_select_id(struct Depsgraph *depsgraph,
     return;
   }
 
-#if 0
-  if (test) {
-    if (qtest()) {
-      addafterqueue(ar->win, BACKBUFDRAW, 1);
-      return;
-    }
-  }
-#endif
-
-#if 0 /* v3d->zbuf deprecated */
-  if (v3d->shading.type > OB_WIRE) {
-    v3d->zbuf = true;
-  }
-#endif
-
-  G.f |= G_FLAG_BACKBUFSEL;
-
   if (obact_eval && ((obact_eval->base_flag & BASE_VISIBLE) != 0)) {
     DRW_framebuffer_select_id_setup(ar, true);
     DRW_draw_select_id_object(scene_eval,
@@ -225,8 +205,6 @@ static void validate_object_select_id(struct Depsgraph *depsgraph,
   /* TODO: Create a flag in `DRW_manager` because the drawing is no longer
    *       made on the backbuffer in this case. */
   v3d->flag &= ~V3D_INVALID_BACKBUF;
-
-  G.f &= ~G_FLAG_BACKBUFSEL;
 }
 
 /* TODO: Creating, attaching texture, and destroying a framebuffer is quite slow.



More information about the Bf-blender-cvs mailing list