[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46804] trunk/blender/source/blender/ editors: Various small fixes:
Bastien Montagne
montagne29 at wanadoo.fr
Sun May 20 15:56:43 CEST 2012
Revision: 46804
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46804
Author: mont29
Date: 2012-05-20 13:56:42 +0000 (Sun, 20 May 2012)
Log Message:
-----------
Various small fixes:
*i18n: panel title of current tool in 3D view & File windows are now translated, as well a redo (F3) menu.
*MESH_OT_faces_select_linked_flat & MESH_OT_edges_select_sharp: use ANGLE RNA prop for sharpness, and fix tip of the later op.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_file/file_panels.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-05-20 12:52:46 UTC (rev 46803)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-05-20 13:56:42 UTC (rev 46804)
@@ -2245,8 +2245,6 @@
BMLoop *l1, *l2;
float sharp = RNA_float_get(op->ptr, "sharpness"), angle;
- sharp = DEG2RADF(sharp);
-
BM_ITER_MESH (e, &iter, em->bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) || !e->l)
continue;
@@ -2273,9 +2271,11 @@
void MESH_OT_edges_select_sharp(wmOperatorType *ot)
{
+ PropertyRNA *prop;
+
/* identifiers */
ot->name = "Select Sharp Edges";
- ot->description = "Marked selected edges as sharp";
+ ot->description = "Select all sharp-enough edges";
ot->idname = "MESH_OT_edges_select_sharp";
/* api callbacks */
@@ -2286,7 +2286,9 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* props */
- RNA_def_float(ot->srna, "sharpness", 1.0f, 0.01f, FLT_MAX, "sharpness", "", 1.0f, 180.0f);
+ prop = RNA_def_float_rotation(ot->srna, "sharpness", 0, NULL, DEG2RADF(0.01f), DEG2RADF(180.0f),
+ "Sharpness", "", DEG2RADF(1.0f), DEG2RADF(180.0f));
+ RNA_def_property_float_default(prop, DEG2RADF(1.0f));
}
static int edbm_select_linked_flat_faces_exec(bContext *C, wmOperator *op)
@@ -2300,8 +2302,6 @@
float sharp = RNA_float_get(op->ptr, "sharpness");
int i;
- sharp = (sharp * (float)M_PI) / 180.0f;
-
BM_ITER_MESH (f, &iter, em->bm, BM_FACES_OF_MESH) {
BM_elem_flag_disable(f, BM_ELEM_TAG);
}
@@ -2354,6 +2354,8 @@
void MESH_OT_faces_select_linked_flat(wmOperatorType *ot)
{
+ PropertyRNA *prop;
+
/* identifiers */
ot->name = "Select Linked Flat Faces";
ot->description = "Select linked faces by angle";
@@ -2367,7 +2369,9 @@
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* props */
- RNA_def_float(ot->srna, "sharpness", 1.0f, 0.01f, FLT_MAX, "sharpness", "", 1.0f, 180.0f);
+ prop = RNA_def_float_rotation(ot->srna, "sharpness", 0, NULL, DEG2RADF(0.01f), DEG2RADF(180.0f),
+ "Sharpness", "", DEG2RADF(1.0f), DEG2RADF(180.0f));
+ RNA_def_property_float_default(prop, DEG2RADF(1.0f));
}
static int edbm_select_non_manifold_exec(bContext *C, wmOperator *op)
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2012-05-20 12:52:46 UTC (rev 46803)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2012-05-20 13:56:42 UTC (rev 46804)
@@ -2501,11 +2501,11 @@
if (items == 0)
return OPERATOR_CANCELLED;
- pup = uiPupMenuBegin(C, op->type->name, ICON_NONE);
+ pup = uiPupMenuBegin(C, RNA_struct_ui_name(op->type->srna), ICON_NONE);
layout = uiPupMenuLayout(pup);
for (i = items - 1, lastop = wm->operators.last; lastop; lastop = lastop->prev, i--)
- uiItemIntO(layout, lastop->type->name, ICON_NONE, op->type->idname, "index", i);
+ uiItemIntO(layout, RNA_struct_ui_name(lastop->type->srna), ICON_NONE, op->type->idname, "index", i);
uiPupMenuEnd(C, pup);
Modified: trunk/blender/source/blender/editors/space_file/file_panels.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_panels.c 2012-05-20 12:52:46 UTC (rev 46803)
+++ trunk/blender/source/blender/editors/space_file/file_panels.c 2012-05-20 13:56:42 UTC (rev 46804)
@@ -174,7 +174,7 @@
SpaceFile *sfile= CTX_wm_space_file(C);
wmOperator *op= sfile->op;
- BLI_strncpy(pa->drawname, op->type->name, sizeof(pa->drawname));
+ BLI_strncpy(pa->drawname, RNA_struct_ui_name(op->type->srna), sizeof(pa->drawname));
}
static int file_panel_check_prop(PointerRNA *UNUSED(ptr), PropertyRNA *prop)
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c 2012-05-20 12:52:46 UTC (rev 46803)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c 2012-05-20 13:56:42 UTC (rev 46804)
@@ -64,7 +64,7 @@
#include "UI_interface.h"
#include "UI_resources.h"
-#include "view3d_intern.h" // own include
+#include "view3d_intern.h" /* own include */
/* ******************* view3d space & buttons ************** */
@@ -78,15 +78,17 @@
{
wmOperator *op = WM_operator_last_redo(C);
- if (op) BLI_strncpy(pa->drawname, op->type->name, sizeof(pa->drawname));
- else BLI_strncpy(pa->drawname, IFACE_("Operator"), sizeof(pa->drawname));
+ if (op)
+ BLI_strncpy(pa->drawname, RNA_struct_ui_name(op->type->srna), sizeof(pa->drawname));
+ else
+ BLI_strncpy(pa->drawname, IFACE_("Operator"), sizeof(pa->drawname));
}
static void view3d_panel_operator_redo_operator(const bContext *C, Panel *pa, wmOperator *op)
{
if (op->type->flag & OPTYPE_MACRO) {
for (op = op->macro.first; op; op = op->next) {
- uiItemL(pa->layout, op->type->name, ICON_NONE);
+ uiItemL(pa->layout, RNA_struct_ui_name(op->type->srna), ICON_NONE);
view3d_panel_operator_redo_operator(C, pa, op);
}
}
More information about the Bf-blender-cvs
mailing list