[Bf-blender-cvs] [e1153c6a1ae] master: DRW: Remove DRW_state_clip_planes_reset

[Clément Foucault]

Commit: e1153c6a1ae97f549fdeedb1612ff1f148c5950a
Author: Clément Foucault
Date:   Mon May 20 19:11:21 2019 +0200
Branches: master
https://developer.blender.org/rBe1153c6a1ae97f549fdeedb1612ff1f148c5950a

DRW: Remove DRW_state_clip_planes_reset

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

M	source/blender/draw/engines/eevee/eevee_lightprobes.c
M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager_exec.c
M	source/blender/draw/modes/edit_curve_mode.c
M	source/blender/draw/modes/edit_mesh_mode.c
M	source/blender/draw/modes/edit_metaball_mode.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 92cd465f771..859770329d6 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -972,8 +972,6 @@ static void lightbake_render_scene_reflected(int layer, EEVEE_BakeRenderData *us
   }
   DRW_draw_pass(psl->transparent_pass);
 
-  DRW_state_clip_planes_reset();
-
   DRW_stats_group_end();
 
   /* Restore */
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 764c102a454..b2ae71d8653 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -687,7 +687,6 @@ void DRW_state_reset(void);
 void DRW_state_lock(DRWState state);
 
 void DRW_state_clip_planes_len_set(uint plane_len);
-void DRW_state_clip_planes_reset(void);
 
 /* Culling, return true if object is inside view frustum. */
 bool DRW_culling_sphere_test(const BoundSphere *bsphere);
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index b4428dd9731..f6d18aeed3d 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -390,7 +390,6 @@ void DRW_state_reset(void)
 /**
  * This only works if DRWPasses have been tagged with DRW_STATE_CLIP_PLANES,
  * and if the shaders have support for it (see usage of gl_ClipDistance).
- * Be sure to call DRW_state_clip_planes_reset() after you finish drawing.
  */
 void DRW_state_clip_planes_len_set(uint plane_len)
 {
@@ -398,11 +397,6 @@ void DRW_state_clip_planes_len_set(uint plane_len)
   /* DUMMY TO REMOVE */
 }
 
-void DRW_state_clip_planes_reset(void)
-{
-  /* DUMMY TO REMOVE */
-}
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c
index fe14ab2c956..ff9f433ad14 100644
--- a/source/blender/draw/modes/edit_curve_mode.c
+++ b/source/blender/draw/modes/edit_curve_mode.c
@@ -330,8 +330,6 @@ static void EDIT_CURVE_draw_scene(void *vedata)
   /* Thoses passes don't write to depth and are AA'ed using other tricks. */
   DRW_draw_pass(psl->overlay_edge_pass);
   DRW_draw_pass(psl->overlay_vert_pass);
-
-  DRW_state_clip_planes_reset();
 }
 
 /* Cleanup when destroying the engine.
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index 6d8990626a0..2b17dd43ee5 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -821,8 +821,6 @@ static void EDIT_MESH_draw_scene(void *vedata)
     DRW_draw_pass(psl->depth_hidden_wire_in_front);
     DRW_draw_pass(psl->edit_face_overlay_in_front);
   }
-
-  DRW_state_clip_planes_reset();
 }
 
 static void EDIT_MESH_engine_free(void)
diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c
index 405603273a4..82b1ddbd66d 100644
--- a/source/blender/draw/modes/edit_metaball_mode.c
+++ b/source/blender/draw/modes/edit_metaball_mode.c
@@ -201,11 +201,6 @@ static void EDIT_METABALL_draw_scene(void *vedata)
   EDIT_METABALL_PassList *psl = ((EDIT_METABALL_Data *)vedata)->psl;
   /* render passes on default framebuffer. */
   DRW_draw_pass(psl->pass);
-
-  /* If you changed framebuffer, double check you rebind
-   * the default one with its textures attached before finishing */
-
-  DRW_state_clip_planes_reset();
 }
 
 /* Cleanup when destroying the engine.