Commit: 6415eaffeb3caf2af55f11f0d51c4ddea82e7631
Author: Julian Eisel
Date: Mon Apr 4 21:53:50 2016 +0200
Branches: temp_widgets_update_tagging
https://developer.blender.org/rB6415eaffeb3caf2af55f11f0d51c4ddea82e7631
Merge branch 'wiggly-widgets' into temp_widgets_update_tagging
Conflicts:
source/blender/windowmanager/widgets/intern/wm_widgetmap.c
===================================================================
===================================================================
diff --cc source/blender/editors/transform/transform_manipulator.c
index c203f1f,2a8a21f..92d8149
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -1210,8 -1194,11 +1210,9 @@@ void WIDGETGROUP_manipulator_init(cons
case MAN_AXIS_ROT_X:
case MAN_AXIS_ROT_Y:
case MAN_AXIS_ROT_Z:
- WIDGET_dial_set_up_vector(axis,
rv3d->twmat[aidx_norm]);
/* increased line width for better display */
WM_widget_set_line_width(axis,
MANIPULATOR_AXIS_LINE_WIDTH + 1.0f);
+ WM_widget_set_flag(axis, WM_WIDGET_DRAW_VALUE,
true);
break;
case MAN_AXIS_TRANS_XY:
case MAN_AXIS_TRANS_YZ:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
