[Bf-blender-cvs] [e13d05b] wiggly-widgets: Minor refactoring to widgets user preference options
Julian Eisel
noreply at git.blender.org
Thu Mar 3 17:27:59 CET 2016
Commit: e13d05ba856f80aa487720e189a0fa4ef43b03ef
Author: Julian Eisel
Date: Thu Mar 3 17:23:45 2016 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBe13d05ba856f80aa487720e189a0fa4ef43b03ef
Minor refactoring to widgets user preference options
Some edits to namings, descriptions in code & UI. Manipulator size of older .blends is now overwritten, don't think it's worth doing version patching.
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/editors/interface/resources.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/transform/transform_manipulator2d.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
M source/blender/windowmanager/widgets/intern/wm_widget.c
M source/blender/windowmanager/widgets/intern/wm_widgetmap.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 61c9799..d7ba07b 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -217,9 +217,9 @@ class USERPREF_PT_interface(Panel):
#col.prop(view, "open_right_mouse_delay", text="Hold RMB")
col.label(text="Widgets:")
- col.prop(view, "manipulator_size")
- col.prop(view, "shaded_widgets")
- col.prop(view, "widgets_3d")
+ col.prop(view, "widget_scale")
+ col.prop(view, "widget_world_space")
+ col.prop(view, "widget_shaded")
col.separator()
col.separator()
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 8cc6d26..4ee7403 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1628,10 +1628,9 @@ void init_userdef_do_versions(void)
U.savetime = 1;
// XXX error(STRINGIFY(BLENDER_STARTUP_FILE)" is buggy, please consider removing it.\n");
}
- /* transform widget settings */
- if (U.tw_size == 0) {
- U.tw_size = 25; /* percentage of window size */
- }
+
+ if (U.widget_scale == 0)
+ U.widget_scale = 75;
if (U.pad_rot_angle == 0.0f)
U.pad_rot_angle = 15.0f;
@@ -2469,8 +2468,6 @@ void init_userdef_do_versions(void)
if (!USER_VERSION_ATLEAST(269, 9)) {
bTheme *btheme;
- U.tw_size = U.tw_size * 5.0f;
-
/* Action Editor (and NLA Editor) - Keyframe Colors */
/* Graph Editor - larger vertex size defaults */
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 27ec6a7..660329b 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -353,7 +353,7 @@ static SpaceLink *view3d_new(const bContext *C)
v3d->near = 0.01f;
v3d->far = 1000.0f;
- v3d->twflag |= U.tw_flag & V3D_USE_MANIPULATOR;
+ v3d->twflag |= U.widget_flag & V3D_USE_MANIPULATOR;
v3d->twtype = V3D_MANIP_TRANSLATE;
v3d->around = V3D_AROUND_CENTER_MEAN;
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index e7883c0..acfa4eb 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1010,7 +1010,7 @@ static void manipulator_prepare_mat(const bContext *C, View3D *v3d, RegionView3D
break;
}
- mul_mat3_m4_fl(rv3d->twmat, ED_view3d_pixel_size(rv3d, rv3d->twmat[3]) * U.tw_size);
+ mul_mat3_m4_fl(rv3d->twmat, ED_view3d_pixel_size(rv3d, rv3d->twmat[3]) * U.widget_scale);
}
/**
diff --git a/source/blender/editors/transform/transform_manipulator2d.c b/source/blender/editors/transform/transform_manipulator2d.c
index e7bdb35..395d0e6 100644
--- a/source/blender/editors/transform/transform_manipulator2d.c
+++ b/source/blender/editors/transform/transform_manipulator2d.c
@@ -174,7 +174,7 @@ void WIDGETGROUP_manipulator2d_create(const bContext *C, wmWidgetGroup *wgroup)
WIDGET_arrow2d_set_line_len(axis, 0.8f);
WM_widget_set_offset(axis, offset);
WM_widget_set_line_width(axis, MANIPULATOR_AXIS_LINE_WIDTH);
- WM_widget_set_scale(axis, U.tw_size);
+ WM_widget_set_scale(axis, U.widget_scale);
WM_widget_set_origin(axis, origin);
WM_widget_set_colors(axis, col, col_hi);
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index e848801..b2cb366 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -486,7 +486,7 @@ typedef struct UserDef {
short gp_settings;
short tb_leftmouse, tb_rightmouse;
struct SolidLight light[3];
- short tw_flag, tw_size;
+ short widget_flag, widget_scale;
int pad3;
short textimeout, texcollectrate;
short wmdrawmethod; /* removed wmpad */
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 13a9297..3a38e3f 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -356,12 +356,11 @@ enum {
#define V3D_MANIP_GIMBAL 4
#define V3D_MANIP_CUSTOM 5 /* anything of value 5 or higher is custom */
-/* View3d->twflag */
+/* View3d->widget_flag */
/* USE = user setting, DRAW = based on selection */
-#define V3D_USE_MANIPULATOR (1 << 0)
-#define V3D_DRAW_MANIPULATOR (1 << 1)
-#define V3D_3D_WIDGETS (1 << 2)
-#define V3D_SHADED_WIDGETS (1 << 3)
+#define V3D_USE_MANIPULATOR (1 << 0)
+#define V3D_3D_WIDGETS (1 << 1)
+#define V3D_SHADED_WIDGETS (1 << 2)
/* BGPic->flag */
/* may want to use 1 for select ? */
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 24347c5..2f7a8f3 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3540,21 +3540,21 @@ static void rna_def_userdef_view(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Rotation Angle", "Rotation step for numerical pad keys (2 4 6 8)");
/* 3D transform widget */
- prop = RNA_def_property(srna, "shaded_widgets", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "tw_flag", V3D_SHADED_WIDGETS);
- RNA_def_property_ui_text(prop, "Shaded Widgets", "Use 3D shading for widgets");
+ prop = RNA_def_property(srna, "widget_shaded", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "widget_flag", V3D_SHADED_WIDGETS);
+ RNA_def_property_ui_text(prop, "Draw Shaded", "Use 3D shading for widgets");
RNA_def_property_update(prop, 0, "rna_userdef_update");
- prop = RNA_def_property(srna, "widgets_3d", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "tw_flag", V3D_3D_WIDGETS);
- RNA_def_property_ui_text(prop, "3D Widgets", "Use 3D view world space for widget sizes");
+ prop = RNA_def_property(srna, "widget_world_space", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "widget_flag", V3D_3D_WIDGETS);
+ RNA_def_property_ui_text(prop, "Zoom Like Geometry", "Make widgets zoom dependent as if they were geometry");
RNA_def_property_update(prop, 0, "rna_userdef_update");
-
- prop = RNA_def_property(srna, "manipulator_size", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "tw_size");
+
+ prop = RNA_def_property(srna, "widget_scale", PROP_INT, PROP_NONE);
+ RNA_def_property_int_sdna(prop, NULL, "widget_scale");
RNA_def_property_range(prop, 10, 200);
RNA_def_property_int_default(prop, 75);
- RNA_def_property_ui_text(prop, "Manipulator Size", "Size of the transform manipulator");
+ RNA_def_property_ui_text(prop, "Scale", "Base size applied to scalable widgets");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "object_origin_size", PROP_INT, PROP_PIXEL);
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
index b3750f0..3a36462 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
@@ -166,7 +166,7 @@ static void arrow_draw_geom(const ArrowWidget *arrow, const bool select)
else {
const float len = 0.25f;
const float width = 0.06f;
- const bool use_lighting = select == false && ((U.tw_flag & V3D_SHADED_WIDGETS) != 0);
+ const bool use_lighting = select == false && ((U.widget_flag & V3D_SHADED_WIDGETS) != 0);
/* translate to line end */
glTranslatef(0.0f, 0.0f, arrow->len);
diff --git a/source/blender/windowmanager/widgets/intern/wm_widget.c b/source/blender/windowmanager/widgets/intern/wm_widget.c
index 51abd76..71ea2fe 100644
--- a/source/blender/windowmanager/widgets/intern/wm_widget.c
+++ b/source/blender/windowmanager/widgets/intern/wm_widget.c
@@ -58,7 +58,7 @@ void widget_draw_intern(WidgetDrawInfo *info, const bool select)
{
GLuint buf[3];
- const bool use_lighting = !select && ((U.tw_flag & V3D_SHADED_WIDGETS) != 0);
+ const bool use_lighting = !select && ((U.widget_flag & V3D_SHADED_WIDGETS) != 0);
if (use_lighting)
glGenBuffers(3, buf);
@@ -380,19 +380,19 @@ void wm_widget_calculate_scale(wmWidget *widget, const bContext *C)
float scale = 1.0f;
if (widget->flag & WM_WIDGET_SCALE_3D) {
- if (rv3d && (U.tw_flag & V3D_3D_WIDGETS) == 0) {
+ if (rv3d && (U.widget_flag & V3D_3D_WIDGETS) == 0) {
if (widget->get_final_position) {
float position[3];
widget->get_final_position(widget, position);
- scale = ED_view3d_pixel_size(rv3d, position) * (float)U.tw_size;
+ scale = ED_view3d_pixel_size(rv3d, position) * (float)U.widget_scale;
}
else {
- scale = ED_view3d_pixel_size(rv3d, widget->origin) * (float)U.tw_size;
+ scale = ED_view3d_pixel_size(rv3d, widget->origin) * (float)U.widget_scale;
}
}
else {
- scale = U.tw_size * 0.02f;
+ scale = U.widget_scale * 0.02f;
}
}
diff --git a/source/blender/windowmanager/widgets/intern/wm_widgetmap.c b/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
index 445c5c6..310522d 100644
--- a/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
+++ b/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
@@ -263,7 +263,7 @@ void WM_widgetmap_widgets_draw(
const bool in_scene, const bool free_drawwidgets)
{
const bool draw_multisample = (U.ogl_multisamples != USER_MULTISAMPLE_NONE);
- const bool use_lighting = (U.tw_flag & V3D_SHADED_WIDGETS) != 0;
+ const bool use_lighting = (U.widget_flag & V3D_SHADED_WIDGETS) != 0;
if (!wmap)
return;
More information about the Bf-blender-cvs
mailing list