[Bf-blender-cvs] [a0df3c4d519] draw-viewport-data: Fix incorrect merge: missing function `DRW_view_get_active`.

Jeroen Bakker noreply at git.blender.org
Mon Oct 4 11:56:42 CEST 2021


Commit: a0df3c4d51915d13b1fdf1b7bced16f2e8a1d11c
Author: Jeroen Bakker
Date:   Mon Oct 4 11:21:38 2021 +0200
Branches: draw-viewport-data
https://developer.blender.org/rBa0df3c4d51915d13b1fdf1b7bced16f2e8a1d11c

Fix incorrect merge: missing function `DRW_view_get_active`.

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

M	source/blender/draw/intern/draw_manager_exec.c

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

diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 22356a3c57b..aa01ca7a262 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -367,6 +367,11 @@ void DRW_view_set_active(DRWView *view)
   DST.view_active = (view) ? view : DST.view_default;
 }
 
+const DRWView *DRW_view_get_active(void)
+{
+  return DST.view_active;
+}
+
 /* Return True if the given BoundSphere intersect the current view frustum */
 static bool draw_culling_sphere_test(const BoundSphere *frustum_bsphere,
                                      const float (*frustum_planes)[4],



More information about the Bf-blender-cvs mailing list