kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #27224: Extrude Repeat Mesh doesn't have options

Browse Source 
Poll function was too strict for this case that's why there was
no options in operator panel.

Additional changes:
- Added 'direction' parameter to operator so now extruding
  could be made from script by providing direction vector.
- Fill this direction vection in operator's invoke functions
  so abjusting offset/steps in operator panel gives better visual
  feedback -- direction stays unchanged so user could easily see
  final result.
- Made some tweaks to soft limits, so adjusting values by mouse
  drag isn't such confusing now.

Tested in normal mode (from 3d view), as script and in background mode.
Haven't noticed any regressions.
This commit is contained in:
Sergey Sharybin 2011-04-30 18:47:06 +00:00
parent f86565c90e
commit 4734a33215
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/editors/mesh/editmesh_tools.c
View File

@ -891,13 +891,11 @@ void MESH_OT_split(wmOperatorType *ot)
} }
static int extrude_repeat_mesh(bContext *C, wmOperator *op) static int extrude_repeat_mesh_exec(bContext *C, wmOperator *op)
{ {
Object *obedit= CTX_data_edit_object(C); Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data); EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
RegionView3D *rv3d = ED_view3d_context_rv3d(C);
int steps = RNA_int_get(op->ptr,"steps"); int steps = RNA_int_get(op->ptr,"steps");
float offs = RNA_float_get(op->ptr,"offset"); float offs = RNA_float_get(op->ptr,"offset");
@ -906,9 +904,7 @@ static int extrude_repeat_mesh(bContext *C, wmOperator *op)
short a; short a;
/* dvec */ /* dvec */
dvec[0]= rv3d->persinv[2][0]; RNA_float_get_array(op->ptr, "direction", dvec);
dvec[1]= rv3d->persinv[2][1];
dvec[2]= rv3d->persinv[2][2];
normalize_v3(dvec); normalize_v3(dvec);
dvec[0]*= offs; dvec[0]*= offs;
dvec[1]*= offs; dvec[1]*= offs;
@ -935,6 +931,17 @@ static int extrude_repeat_mesh(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
/* get center and axis, in global coords */
static int extrude_repeat_mesh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{
RegionView3D *rv3d= ED_view3d_context_rv3d(C);
if(rv3d)
RNA_float_set_array(op->ptr, "direction", rv3d->persinv[2]);
return extrude_repeat_mesh_exec(C, op);
}
void MESH_OT_extrude_repeat(wmOperatorType *ot) void MESH_OT_extrude_repeat(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
@ -943,15 +950,17 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot)
ot->idname= "MESH_OT_extrude_repeat"; ot->idname= "MESH_OT_extrude_repeat";
/* api callbacks */ /* api callbacks */
ot->exec= extrude_repeat_mesh; ot->invoke= extrude_repeat_mesh_invoke;
ot->poll= ED_operator_editmesh_region_view3d; ot->exec= extrude_repeat_mesh_exec;
ot->poll= ED_operator_editmesh;
/* flags */ /* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */ /* props */
RNA_def_float(ot->srna, "offset", 2.0f, 0.0f, 100.0f, "Offset", "", 0.0f, FLT_MAX); RNA_def_float(ot->srna, "offset", 2.0f, 0.0f, 100.0f, "Offset", "", 0.0f, 100.0f);
RNA_def_int(ot->srna, "steps", 10, 0, 180, "Steps", "", 0, INT_MAX); RNA_def_int(ot->srna, "steps", 10, 0, 180, "Steps", "", 0, 180);
RNA_def_float_vector(ot->srna, "direction", 3, NULL, -FLT_MAX, FLT_MAX, "Direction", "Direction of extrude", -FLT_MAX, FLT_MAX);
} }
/* ************************** spin operator ******************** */ /* ************************** spin operator ******************** */