diff options
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editface.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 32 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_lib.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_loop.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 67 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 58 | ||||
| -rw-r--r-- | source/blender/editors/mesh/loopcut.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 2 |
12 files changed, 102 insertions, 98 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 0e1ac1aa7e8..19eb782884d 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 0b104e02669..ce65529e3dd 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. @@ -1541,7 +1541,7 @@ void MESH_OT_separate(wmOperatorType *ot) { /* identifiers */ ot->name= "Separate"; - ot->description= "Separate selected geometry into a new mesh."; + ot->description= "Separate selected geometry into a new mesh"; ot->idname= "MESH_OT_separate"; /* api callbacks */ diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index b79b840eac0..93b8f4ba6e2 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2004 by Blender Foundation. * All rights reserved. @@ -228,7 +228,7 @@ void MESH_OT_dupli_extrude_cursor(wmOperatorType *ot) { /* identifiers */ ot->name= "Duplicate or Extrude at 3D Cursor"; - ot->description= "Duplicate and extrude selected vertices, edges or faces towards 3D Cursor."; + ot->description= "Duplicate and extrude selected vertices, edges or faces towards 3D Cursor"; ot->idname= "MESH_OT_dupli_extrude_cursor"; /* api callbacks */ @@ -359,7 +359,7 @@ void MESH_OT_fgon_make(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Make F-gon"; - ot->description= "Make fgon from selected faces."; + ot->description= "Make fgon from selected faces"; ot->idname= "MESH_OT_fgon_make"; /* api callbacks */ @@ -391,7 +391,7 @@ void MESH_OT_fgon_clear(struct wmOperatorType *ot) { /* identifiers */ ot->name= "Clear F-gon"; - ot->description= "Clear fgon from selected face."; + ot->description= "Clear fgon from selected face"; ot->idname= "MESH_OT_fgon_clear"; /* api callbacks */ @@ -803,7 +803,7 @@ void MESH_OT_edge_face_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Make Edge/Face"; - ot->description= "Add an edge or face to selected."; + ot->description= "Add an edge or face to selected"; ot->idname= "MESH_OT_edge_face_add"; /* api callbacks */ @@ -1323,7 +1323,7 @@ void MESH_OT_primitive_plane_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Plane"; - ot->description= "Construct a filled planar mesh with 4 vertices."; + ot->description= "Construct a filled planar mesh with 4 vertices"; ot->idname= "MESH_OT_primitive_plane_add"; /* api callbacks */ @@ -1355,7 +1355,7 @@ void MESH_OT_primitive_cube_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Cube"; - ot->description= "Construct a cube mesh."; + ot->description= "Construct a cube mesh"; ot->idname= "MESH_OT_primitive_cube_add"; /* api callbacks */ @@ -1389,7 +1389,7 @@ void MESH_OT_primitive_circle_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Circle"; - ot->description= "Construct a circle mesh."; + ot->description= "Construct a circle mesh"; ot->idname= "MESH_OT_primitive_circle_add"; /* api callbacks */ @@ -1429,7 +1429,7 @@ void MESH_OT_primitive_tube_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Tube"; - ot->description= "Construct a tube mesh."; + ot->description= "Construct a tube mesh"; ot->idname= "MESH_OT_primitive_tube_add"; /* api callbacks */ @@ -1469,7 +1469,7 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Cone"; - ot->description= "Construct a conic mesh (ends filled)."; + ot->description= "Construct a conic mesh (ends filled)"; ot->idname= "MESH_OT_primitive_cone_add"; /* api callbacks */ @@ -1509,7 +1509,7 @@ void MESH_OT_primitive_grid_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Grid"; - ot->description= "Construct a grid mesh."; + ot->description= "Construct a grid mesh"; ot->idname= "MESH_OT_primitive_grid_add"; /* api callbacks */ @@ -1546,7 +1546,7 @@ void MESH_OT_primitive_monkey_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Monkey"; - ot->description= "Construct a Suzanne mesh."; + ot->description= "Construct a Suzanne mesh"; ot->idname= "MESH_OT_primitive_monkey_add"; /* api callbacks */ @@ -1580,7 +1580,7 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add UV Sphere"; - ot->description= "Construct a UV sphere mesh."; + ot->description= "Construct a UV sphere mesh"; ot->idname= "MESH_OT_primitive_uv_sphere_add"; /* api callbacks */ @@ -1593,7 +1593,7 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) /* props */ RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, "Segments", "", 3, 500); - RNA_def_int(ot->srna, "rings", 24, INT_MIN, INT_MAX, "Rings", "", 3, 500); + RNA_def_int(ot->srna, "rings", 16, INT_MIN, INT_MAX, "Rings", "", 3, 500); RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00); ED_object_add_generic_props(ot, TRUE); @@ -1618,7 +1618,7 @@ void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Ico Sphere"; - ot->description= "Construct an Icosphere mesh."; + ot->description= "Construct an Icosphere mesh"; ot->idname= "MESH_OT_primitive_ico_sphere_add"; /* api callbacks */ @@ -1666,7 +1666,7 @@ void MESH_OT_duplicate(wmOperatorType *ot) { /* identifiers */ ot->name= "Duplicate"; - ot->description= "Duplicate selected vertices, edges or faces."; + ot->description= "Duplicate selected vertices, edges or faces"; ot->idname= "MESH_OT_duplicate"; /* api callbacks */ diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c index a5ce4ee5dcd..eaea0c6760b 100644 --- a/source/blender/editors/mesh/editmesh_lib.c +++ b/source/blender/editors/mesh/editmesh_lib.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2004 by Blender Foundation * All rights reserved. diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index 0a3eed99d77..887af0af4c5 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2004 by Blender Foundation. * All rights reserved. @@ -718,7 +718,7 @@ void MESH_OT_knife_cut(wmOperatorType *ot) PropertyRNA *prop; ot->name= "Knife Cut"; - ot->description= "Cut selected edges and faces into parts."; + ot->description= "Cut selected edges and faces into parts"; ot->idname= "MESH_OT_knife_cut"; ot->invoke= WM_gesture_lines_invoke; diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 717b725387a..b2ae7ddf7e0 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2004 Blender Foundation. * All rights reserved. @@ -1294,7 +1294,7 @@ void MESH_OT_select_similar(wmOperatorType *ot) /* identifiers */ ot->name= "Select Similar"; - ot->description= "Select similar vertices, edges or faces by property types."; + ot->description= "Select similar vertices, edges or faces by property types"; ot->idname= "MESH_OT_select_similar"; /* api callbacks */ @@ -2024,7 +2024,7 @@ void MESH_OT_loop_multi_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Multi Select Loops"; - ot->description= "Select a loop of connected edges by connection type."; + ot->description= "Select a loop of connected edges by connection type"; ot->idname= "MESH_OT_loop_multi_select"; /* api callbacks */ @@ -2111,7 +2111,7 @@ void MESH_OT_loop_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Loop Select"; - ot->description= "Select a loop of connected edges."; + ot->description= "Select a loop of connected edges"; ot->idname= "MESH_OT_loop_select"; /* api callbacks */ @@ -2133,7 +2133,7 @@ static void mouse_mesh_shortest_path(bContext *C, short mval[2]) { ViewContext vc; EditMesh *em; - EditEdge *eed; + EditEdge *eed, *eed_act= NULL; int dist= 50; em_setup_viewcontext(C, &vc); @@ -2153,7 +2153,6 @@ static void mouse_mesh_shortest_path(bContext *C, short mval[2]) EditSelection *ese = em->selected.last; if(ese && ese->type == EDITEDGE) { - EditEdge *eed_act; eed_act = (EditEdge*)ese->data; if (eed_act != eed) { if (edgetag_shortest_path(vc.scene, em, eed_act, eed)) { @@ -2167,14 +2166,20 @@ static void mouse_mesh_shortest_path(bContext *C, short mval[2]) int act = (edgetag_context_check(vc.scene, eed)==0); edgetag_context_set(vc.scene, eed, act); /* switch the edge option */ } - - EM_selectmode_flush(em); /* even if this is selected it may not be in the selection list */ - if(edgetag_context_check(vc.scene, eed)==0) + if(edgetag_context_check(vc.scene, eed)==EDGE_MODE_SELECT) EM_remove_selection(em, eed, EDITEDGE); - else + else { + /* other modes need to keep the last edge tagged */ + if(eed_act) + EM_select_edge(eed_act, 0); + + EM_select_edge(eed, 1); EM_store_selection(em, eed, EDITEDGE); + } + + EM_selectmode_flush(em); /* force drawmode for mesh */ switch (vc.scene->toolsettings->edge_mode) { @@ -2213,7 +2218,7 @@ void MESH_OT_select_shortest_path(wmOperatorType *ot) { /* identifiers */ ot->name= "Shortest Path Select"; - ot->description= "Select shortest path between two selections."; + ot->description= "Select shortest path between two selections"; ot->idname= "MESH_OT_select_shortest_path"; /* api callbacks */ @@ -2521,7 +2526,7 @@ void MESH_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Linked"; - ot->description= "(un)select all vertices linked to the active mesh."; + ot->description= "(un)select all vertices linked to the active mesh"; ot->idname= "MESH_OT_select_linked_pick"; /* api callbacks */ @@ -2610,7 +2615,7 @@ void MESH_OT_select_linked(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Linked All"; - ot->description= "Select all vertices linked to the active mesh."; + ot->description= "Select all vertices linked to the active mesh"; ot->idname= "MESH_OT_select_linked"; /* api callbacks */ @@ -2747,7 +2752,7 @@ void MESH_OT_hide(wmOperatorType *ot) { /* identifiers */ ot->name= "Hide Selection"; - ot->description= "Hide (un)selected vertices, edges or faces."; + ot->description= "Hide (un)selected vertices, edges or faces"; ot->idname= "MESH_OT_hide"; /* api callbacks */ @@ -2814,7 +2819,7 @@ void MESH_OT_reveal(wmOperatorType *ot) { /* identifiers */ ot->name= "Reveal Hidden"; - ot->description= "Reveal all hidden vertices, edges and faces."; + ot->description= "Reveal all hidden vertices, edges and faces"; ot->idname= "MESH_OT_reveal"; /* api callbacks */ @@ -2869,7 +2874,7 @@ void MESH_OT_select_by_number_vertices(wmOperatorType *ot) /* identifiers */ ot->name= "Select by Number of Vertices"; - ot->description= "Select vertices or faces by vertex count."; + ot->description= "Select vertices or faces by vertex count"; ot->idname= "MESH_OT_select_by_number_vertices"; /* api callbacks */ @@ -2903,7 +2908,7 @@ void MESH_OT_select_mirror(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Mirror"; - ot->description= "Select mesh items at mirrored locations."; + ot->description= "Select mesh items at mirrored locations"; ot->idname= "MESH_OT_select_mirror"; /* api callbacks */ @@ -3024,7 +3029,7 @@ void MESH_OT_edges_select_sharp(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Sharp Edges"; - ot->description= "Marked selected edges as sharp."; + ot->description= "Marked selected edges as sharp"; ot->idname= "MESH_OT_edges_select_sharp"; /* api callbacks */ @@ -3192,7 +3197,7 @@ void MESH_OT_faces_select_linked_flat(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Linked Flat Faces"; - ot->description= "Select linked faces by angle."; + ot->description= "Select linked faces by angle"; ot->idname= "MESH_OT_faces_select_linked_flat"; /* api callbacks */ @@ -3293,7 +3298,7 @@ void MESH_OT_select_non_manifold(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Non Manifold"; - ot->description= "Select all non-manifold vertices or edges."; + ot->description= "Select all non-manifold vertices or edges"; ot->idname= "MESH_OT_select_non_manifold"; /* api callbacks */ @@ -3357,7 +3362,7 @@ void MESH_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Inverse"; - ot->description= "Select inverse of (un)selected vertices, edges or faces."; + ot->description= "Select inverse of (un)selected vertices, edges or faces"; ot->idname= "MESH_OT_select_inverse"; /* api callbacks */ @@ -3419,7 +3424,7 @@ void MESH_OT_select_all(wmOperatorType *ot) { /* identifiers */ ot->name= "Select/Deselect All"; - ot->description= "Change selection of all vertices, edges or faces."; + ot->description= "Change selection of all vertices, edges or faces"; ot->idname= "MESH_OT_select_all"; /* api callbacks */ @@ -3492,7 +3497,7 @@ void MESH_OT_select_more(wmOperatorType *ot) { /* identifiers */ ot->name= "Select More"; - ot->description= "Select more vertices, edges or faces connected to initial selection."; + ot->description= "Select more vertices, edges or faces connected to initial selection"; ot->idname= "MESH_OT_select_more"; /* api callbacks */ @@ -3582,7 +3587,7 @@ void MESH_OT_select_less(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Less"; - ot->description= "Select less vertices, edges or faces connected to initial selection."; + ot->description= "Select less vertices, edges or faces connected to initial selection"; ot->idname= "MESH_OT_select_less"; /* api callbacks */ @@ -3652,7 +3657,7 @@ void MESH_OT_select_random(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Random"; - ot->description= "Randomly select vertices."; + ot->description= "Randomly select vertices"; ot->idname= "MESH_OT_select_random"; /* api callbacks */ @@ -3739,7 +3744,7 @@ void MESH_OT_mark_seam(wmOperatorType *ot) { /* identifiers */ ot->name= "Mark Seam"; - ot->description= "(un)mark selected edges as a seam."; + ot->description= "(un)mark selected edges as a seam"; ot->idname= "MESH_OT_mark_seam"; /* api callbacks */ @@ -3791,7 +3796,7 @@ void MESH_OT_mark_sharp(wmOperatorType *ot) { /* identifiers */ ot->name= "Mark Sharp"; - ot->description= "(un)mark selected edges as sharp."; + ot->description= "(un)mark selected edges as sharp"; ot->idname= "MESH_OT_mark_sharp"; /* api callbacks */ @@ -4035,7 +4040,7 @@ void MESH_OT_normals_make_consistent(wmOperatorType *ot) { /* identifiers */ ot->name= "Make Normals Consistent"; - ot->description= "Flip all selected vertex and face normals in a consistent direction."; + ot->description= "Flip all selected vertex and face normals in a consistent direction"; ot->idname= "MESH_OT_normals_make_consistent"; /* api callbacks */ @@ -4379,7 +4384,7 @@ void MESH_OT_vertices_smooth(wmOperatorType *ot) { /* identifiers */ ot->name= "Smooth Vertex"; - ot->description= "Flatten angles of selected vertices."; + ot->description= "Flatten angles of selected vertices"; ot->idname= "MESH_OT_vertices_smooth"; /* api callbacks */ @@ -4486,7 +4491,7 @@ void MESH_OT_flip_normals(wmOperatorType *ot) { /* identifiers */ ot->name= "Flip Normals"; - ot->description= "Toggle the direction of selected face's vertex and face normals."; + ot->description= "Toggle the direction of selected face's vertex and face normals"; ot->idname= "MESH_OT_flip_normals"; /* api callbacks */ @@ -4528,7 +4533,7 @@ void MESH_OT_solidify(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ ot->name= "Solidify"; - ot->description= "Create a solid skin by extruding, compensating for sharp angles."; + ot->description= "Create a solid skin by extruding, compensating for sharp angles"; ot->idname= "MESH_OT_solidify"; /* api callbacks */ diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index f601dcb06cf..438aacaa54a 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2004 by Blender Foundation. * All rights reserved. @@ -503,7 +503,7 @@ void MESH_OT_remove_doubles(wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Doubles"; - ot->description= "Remove duplicate vertices."; + ot->description= "Remove duplicate vertices"; ot->idname= "MESH_OT_remove_doubles"; /* api callbacks */ @@ -784,7 +784,7 @@ void MESH_OT_extrude(wmOperatorType *ot) /* identifiers */ ot->name= "Extrude"; - ot->description= "Extrude selected vertices, edges or faces."; + ot->description= "Extrude selected vertices, edges or faces"; ot->idname= "MESH_OT_extrude"; /* api callbacks */ @@ -827,7 +827,7 @@ void MESH_OT_split(wmOperatorType *ot) { /* identifiers */ ot->name= "Split"; - ot->description= "Split selected geometry into separate disconnected mesh."; + ot->description= "Split selected geometry into separate disconnected mesh"; ot->idname= "MESH_OT_split"; /* api callbacks */ @@ -887,7 +887,7 @@ void MESH_OT_extrude_repeat(wmOperatorType *ot) { /* identifiers */ ot->name= "Extrude Repeat Mesh"; - ot->description= "Extrude selected vertices, edges or faces repeatedly."; + ot->description= "Extrude selected vertices, edges or faces repeatedly"; ot->idname= "MESH_OT_extrude_repeat"; /* api callbacks */ @@ -1021,7 +1021,7 @@ void MESH_OT_spin(wmOperatorType *ot) { /* identifiers */ ot->name= "Spin"; - ot->description= "Extrude selected vertices in a circle around the cursor in indicated viewport."; + ot->description= "Extrude selected vertices in a circle around the cursor in indicated viewport"; ot->idname= "MESH_OT_spin"; /* api callbacks */ @@ -1129,7 +1129,7 @@ void MESH_OT_screw(wmOperatorType *ot) { /* identifiers */ ot->name= "Screw"; - ot->description= "Extrude selected vertices in screw-shaped rotation around the cursor in indicated viewport."; + ot->description= "Extrude selected vertices in screw-shaped rotation around the cursor in indicated viewport"; ot->idname= "MESH_OT_screw"; /* api callbacks */ @@ -1365,7 +1365,7 @@ void MESH_OT_delete(wmOperatorType *ot) { /* identifiers */ ot->name= "Delete"; - ot->description= "Delete selected vertices, edges or faces."; + ot->description= "Delete selected vertices, edges or faces"; ot->idname= "MESH_OT_delete"; /* api callbacks */ @@ -3809,7 +3809,7 @@ void MESH_OT_edge_rotate(wmOperatorType *ot) { /* identifiers */ ot->name= "Rotate Selected Edge"; - ot->description= "Rotate selected edge or adjoining faces."; + ot->description= "Rotate selected edge or adjoining faces"; ot->idname= "MESH_OT_edge_rotate"; /* api callbacks */ @@ -5046,7 +5046,7 @@ void MESH_OT_rip(wmOperatorType *ot) { /* identifiers */ ot->name= "Rip"; - ot->description= "Rip selection from mesh (quads only)."; + ot->description= "Rip selection from mesh (quads only)"; ot->idname= "MESH_OT_rip"; /* api callbacks */ @@ -5127,7 +5127,7 @@ void MESH_OT_shape_propagate_to_all(wmOperatorType *ot) { /* identifiers */ ot->name= "Shape Propagate"; - ot->description= "Apply selected vertex locations to all other shape keys."; + ot->description= "Apply selected vertex locations to all other shape keys"; ot->idname= "MESH_OT_shape_propagate_to_all"; /* api callbacks */ @@ -5222,7 +5222,7 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot) /* identifiers */ ot->name= "Blend From Shape"; - ot->description= "Blend in shape from a shape key."; + ot->description= "Blend in shape from a shape key"; ot->idname= "MESH_OT_blend_from_shape"; /* api callbacks */ @@ -5923,7 +5923,7 @@ void MESH_OT_merge(wmOperatorType *ot) /* identifiers */ ot->name= "Merge"; - ot->description= "Merge selected vertices."; + ot->description= "Merge selected vertices"; ot->idname= "MESH_OT_merge"; /* api callbacks */ @@ -6127,7 +6127,7 @@ void MESH_OT_select_vertex_path(wmOperatorType *ot) /* identifiers */ ot->name= "Select Vertex Path"; - ot->description= "Select shortest path between two vertices by distance type."; + ot->description= "Select shortest path between two vertices by distance type"; ot->idname= "MESH_OT_select_vertex_path"; /* api callbacks */ @@ -6189,7 +6189,7 @@ void MESH_OT_region_to_loop(wmOperatorType *ot) { /* identifiers */ ot->name= "Region to Loop"; - ot->description= "Select a region as a loop of connected edges."; + ot->description= "Select a region as a loop of connected edges"; ot->idname= "MESH_OT_region_to_loop"; /* api callbacks */ @@ -6365,7 +6365,7 @@ void MESH_OT_loop_to_region(wmOperatorType *ot) { /* identifiers */ ot->name= "Loop to Region"; - ot->description= "Select a loop of connected edges as a region."; + ot->description= "Select a loop of connected edges as a region"; ot->idname= "MESH_OT_loop_to_region"; /* api callbacks */ @@ -6660,7 +6660,7 @@ void MESH_OT_uvs_rotate(wmOperatorType *ot) { /* identifiers */ ot->name= "Rotate UVs"; - ot->description= "Rotate selected UVs."; + ot->description= "Rotate selected UVs"; ot->idname= "MESH_OT_uvs_rotate"; /* api callbacks */ @@ -6678,7 +6678,7 @@ void MESH_OT_uvs_mirror(wmOperatorType *ot) { /* identifiers */ ot->name= "Mirror UVs"; - ot->description= "Mirror selected UVs."; + ot->description= "Mirror selected UVs"; ot->idname= "MESH_OT_uvs_mirror"; /* api callbacks */ @@ -6696,7 +6696,7 @@ void MESH_OT_colors_rotate(wmOperatorType *ot) { /* identifiers */ ot->name= "Rotate Colors"; - ot->description= "Rotate UV/image color layer."; + ot->description= "Rotate UV/image color layer"; ot->idname= "MESH_OT_colors_rotate"; /* api callbacks */ @@ -6714,7 +6714,7 @@ void MESH_OT_colors_mirror(wmOperatorType *ot) { /* identifiers */ ot->name= "Mirror Colors"; - ot->description= "Mirror UV/image color layer."; + ot->description= "Mirror UV/image color layer"; ot->idname= "MESH_OT_colors_mirror"; /* api callbacks */ @@ -6757,7 +6757,7 @@ void MESH_OT_subdivide(wmOperatorType *ot) { /* identifiers */ ot->name= "Subdivide"; - ot->description= "Subdivide selected edges."; + ot->description= "Subdivide selected edges"; ot->idname= "MESH_OT_subdivide"; /* api callbacks */ @@ -7039,7 +7039,7 @@ void MESH_OT_fill(wmOperatorType *ot) { /* identifiers */ ot->name= "Fill"; - ot->description= "Create a segment, edge or face."; + ot->description= "Create a segment, edge or face"; ot->idname= "MESH_OT_fill"; /* api callbacks */ @@ -7069,7 +7069,7 @@ void MESH_OT_beautify_fill(wmOperatorType *ot) { /* identifiers */ ot->name= "Beautify Fill"; - ot->description= "Rearrange geometry on a selected surface to avoid skinny faces."; + ot->description= "Rearrange geometry on a selected surface to avoid skinny faces"; ot->idname= "MESH_OT_beautify_fill"; /* api callbacks */ @@ -7100,7 +7100,7 @@ void MESH_OT_quads_convert_to_tris(wmOperatorType *ot) { /* identifiers */ ot->name= "Quads to Tris"; - ot->description= "Convert selected quads to triangles."; + ot->description= "Convert selected quads to triangles"; ot->idname= "MESH_OT_quads_convert_to_tris"; /* api callbacks */ @@ -7129,7 +7129,7 @@ void MESH_OT_tris_convert_to_quads(wmOperatorType *ot) { /* identifiers */ ot->name= "Tris to Quads"; - ot->description= "Convert selected triangles to quads."; + ot->description= "Convert selected triangles to quads"; ot->idname= "MESH_OT_tris_convert_to_quads"; /* api callbacks */ @@ -7158,7 +7158,7 @@ void MESH_OT_edge_flip(wmOperatorType *ot) { /* identifiers */ ot->name= "Edge Flip"; - ot->description= "Flip selected edge or adjoining faces."; + ot->description= "Flip selected edge or adjoining faces"; ot->idname= "MESH_OT_edge_flip"; /* api callbacks */ @@ -7204,7 +7204,7 @@ void MESH_OT_faces_shade_smooth(wmOperatorType *ot) { /* identifiers */ ot->name= "Shade Smooth"; - ot->description= "Display faces 'smooth' (using vertex normals)."; + ot->description= "Display faces 'smooth' (using vertex normals)"; ot->idname= "MESH_OT_faces_shade_smooth"; /* api callbacks */ @@ -7232,7 +7232,7 @@ void MESH_OT_faces_shade_flat(wmOperatorType *ot) { /* identifiers */ ot->name= "Shade Flat"; - ot->description= "Display faces 'flat'."; + ot->description= "Display faces 'flat'"; ot->idname= "MESH_OT_faces_shade_flat"; /* api callbacks */ @@ -7309,7 +7309,7 @@ void MESH_OT_select_axis(wmOperatorType *ot) /* identifiers */ ot->name= "Select Axis"; - ot->description= "Select all data in the mesh on a single axis."; + ot->description= "Select all data in the mesh on a single axis"; ot->idname= "MESH_OT_select_axis"; /* api callbacks */ diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index ba679afbfa7..012c552241a 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2007 Blender Foundation. * All rights reserved. @@ -491,7 +491,7 @@ void MESH_OT_loopcut (wmOperatorType *ot) /* description */ ot->name= "Loop Cut"; ot->idname= "MESH_OT_loopcut"; - ot->description= "Add a new loop between existing loops."; + ot->description= "Add a new loop between existing loops"; /* callbacks */ ot->invoke= ringcut_invoke; diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 90764388029..b18f19885be 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. @@ -300,7 +300,7 @@ void MESH_OT_uv_texture_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add UV Texture"; - ot->description= "Add UV texture layer."; + ot->description= "Add UV texture layer"; ot->idname= "MESH_OT_uv_texture_add"; /* api callbacks */ @@ -388,7 +388,7 @@ void MESH_OT_uv_texture_remove(wmOperatorType *ot) { /* identifiers */ ot->name= "Remove UV Texture"; - ot->description= "Remove UV texture layer."; + ot->description= "Remove UV texture layer"; ot->idname= "MESH_OT_uv_texture_remove"; /* api callbacks */ @@ -417,7 +417,7 @@ void MESH_OT_vertex_color_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Vertex Color"; - ot->description= "Add vertex color layer."; + ot->description= "Add vertex color layer"; ot->idname= "MESH_OT_vertex_color_add"; /* api callbacks */ @@ -443,7 +443,7 @@ void MESH_OT_vertex_color_remove(wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Vertex Color"; - ot->description= "Remove vertex color layer."; + ot->description= "Remove vertex color layer"; ot->idname= "MESH_OT_vertex_color_remove"; /* api callbacks */ @@ -478,7 +478,7 @@ void MESH_OT_sticky_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Sticky"; - ot->description= "Add sticky UV texture layer."; + ot->description= "Add sticky UV texture layer"; ot->idname= "MESH_OT_sticky_add"; /* api callbacks */ @@ -510,7 +510,7 @@ void MESH_OT_sticky_remove(wmOperatorType *ot) { /* identifiers */ ot->name= "Remove Sticky"; - ot->description= "Remove sticky UV texture layer."; + ot->description= "Remove sticky UV texture layer"; ot->idname= "MESH_OT_sticky_remove"; /* api callbacks */ diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 950da02b50d..1855b67672d 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 703333343b4..87fe9948a37 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2009 Blender Foundation. * All rights reserved. @@ -172,7 +172,6 @@ void ED_operatormacros_mesh(void) { wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - int constraint_axis[3] = {0, 0, 1}; ot= WM_operatortype_append_macro("MESH_OT_loopcut_slide", "Loop Cut and Slide", OPTYPE_UNDO|OPTYPE_REGISTER); WM_operatortype_macro_define(ot, "MESH_OT_loopcut"); @@ -193,8 +192,6 @@ void ED_operatormacros_mesh(void) RNA_enum_set(otmacro->ptr, "type", 1); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); - RNA_enum_set(otmacro->ptr, "constraint_orientation", V3D_MANIP_NORMAL); - RNA_boolean_set_array(otmacro->ptr, "constraint_axis", constraint_axis); ot= WM_operatortype_append_macro("MESH_OT_extrude_faces_move", "Extrude Individual Faces and Move", OPTYPE_UNDO|OPTYPE_REGISTER); otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); @@ -264,7 +261,9 @@ void ED_keymap_mesh(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "MESH_OT_normals_make_consistent", NKEY, KM_PRESS, KM_CTRL, 0); RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_normals_make_consistent", NKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "inside", 1); - WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_extrude", EKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_edit_mesh_extrude_move", EKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_edit_mesh_extrude_individual_move", EKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_extrude", EKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "MESH_OT_spin", RKEY, KM_PRESS, KM_ALT, 0); diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 62af987c966..55e8b55dcd5 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2004 by Blender Foundation * All rights reserved. |