[Bf-blender-cvs] [c21122f] custom-manipulators: Move manipulator drawing for new viewport into own function, add comments
Julian Eisel
noreply at git.blender.org
Fri Oct 7 16:27:19 CEST 2016
Commit: c21122f0d354829f07cabe1f16c1d7003bf173d9
Author: Julian Eisel
Date: Fri Oct 7 16:26:03 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rBc21122f0d354829f07cabe1f16c1d7003bf173d9
Move manipulator drawing for new viewport into own function, add comments
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index c8ed5ff..bb37534 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1046,6 +1046,16 @@ static void view3d_draw_grease_pencil(const bContext *C)
/* TODO viewport */
}
+static void view3d_draw_manipulators(const bContext *C, const ARegion *ar)
+{
+ /* TODO, only draws 3D manipulators right now, need to see how 2D drawing will work in new viewport */
+
+ /* draw depth culled manipulators - manipulators need to be updated *after* view matrix was set up */
+ /* TODO depth culling manipulators is not yet supported, just drawing _3D here, should
+ * later become _IN_SCENE (and draw _3D separate) */
+ WM_manipulatormap_draw(ar->manipulator_map, C, WM_MANIPULATORMAP_DRAWSTEP_3D);
+}
+
/**
* This could run once per view, or even in parallel
* for each of them. What is a "view"?
@@ -1066,8 +1076,7 @@ static void view3d_draw_view(const bContext *C, ARegion *ar, DrawData *draw_data
view3d_draw_tool_ui(C);
view3d_draw_reference_images(C);
view3d_draw_grease_pencil(C);
-
- WM_manipulatormap_draw(ar->manipulator_map, C, WM_MANIPULATORMAP_DRAWSTEP_3D);
+ view3d_draw_manipulators(C, ar);
}
void view3d_main_region_draw(const bContext *C, ARegion *ar)
More information about the Bf-blender-cvs
mailing list