Commit: 6e8a0047d6cec0cdb89172b6f2ec3dae7bfcae2f
Author: Julian Eisel
Date: Sat Oct 22 00:31:44 2016 +0200
Branches: transform-manipulators
https://developer.blender.org/rB6e8a0047d6cec0cdb89172b6f2ec3dae7bfcae2f
Merge branch 'blender2.8' into transform-manipulators
===================================================================
===================================================================
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index 37d57b7,9413159..ef56700
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -1596,8 -1676,9 +1680,9 @@@ 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_manipulator(C);
+ view3d_draw_manipulators(C, ar);
view3d_draw_region_info(C, ar);
+ view3d_draw_debug(C, ar, draw_data);
}
void view3d_main_region_draw(const bContext *C, ARegion *ar)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
