Commit: b706b745cebbcabbe2e279e497687e7a2a71fa61
Author: Julian Eisel
Date: Sun Oct 16 21:19:02 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rBb706b745cebbcabbe2e279e497687e7a2a71fa61
Merge branch 'blender2.8' into custom-manipulators
Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/manipulators/WM_manipulator_api.h
source/blender/windowmanager/manipulators/WM_manipulator_types.h
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index bb37534,5b35254..0fd07ab
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -1039,21 -1544,13 +1545,19 @@@ static void view3d_draw_reference_image
}
/**
- * Grease Pencil
- */
- static void view3d_draw_grease_pencil(const bContext *C)
- {
- /* TODO viewport */
- }
-
+ * 3D manipulators
+ */
-static void view3d_draw_manipulator(const bContext *C)
+static void view3d_draw_manipulators(const bContext *C, const ARegion *ar)
{
+ View3D *v3d = CTX_wm_view3d(C);
+ v3d->zbuf = false;
- BIF_draw_manipulator(C);
++
+ /* 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);
}
/**
@@@ -1075,8 -1592,8 +1599,8 @@@ static void view3d_draw_view(const bCon
view3d_draw_other_elements(C, ar);
view3d_draw_tool_ui(C);
view3d_draw_reference_images(C);
- view3d_draw_grease_pencil(C);
- view3d_draw_manipulator(C);
+ view3d_draw_manipulators(C, ar);
+ view3d_draw_region_info(C, ar);
}
void view3d_main_region_draw(const bContext *C, ARegion *ar)
diff --cc source/blender/makesdna/DNA_view3d_types.h
index f69c689,7e0adf4..71c5360
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -145,8 -147,8 +146,9 @@@ typedef struct RegionView3D
float rot_angle;
float rot_axis[3];
+ int pad2;
struct GPUFX *compositor;
+ struct GPUViewport *viewport;
} RegionView3D;
/* 3D ViewPort Struct */
diff --cc source/blender/windowmanager/wm.h
index 8ea2cf9,3dd2941..3960290
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@@ -33,14 -33,9 +33,16 @@@
struct wmWindow;
struct ReportList;
+struct wmEvent;
+struct wmOperatorType;
+struct PointerRNA;
+struct PropertyRNA;
+struct wmOperator;
+
+#include "manipulators/wm_manipulator_wmapi.h" /* manipulators wm API */
+ #include "manipulators/wm_manipulator_wmapi.h"
+
typedef struct wmPaintCursor {
struct wmPaintCursor *next, *prev;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
