[Bf-blender-cvs] [dd08d68df83] master: Transform: New Snap Option: Edge Perpendicular

mano-wii noreply at git.blender.org
Wed Aug 21 00:18:59 CEST 2019


Commit: dd08d68df835e54ccd1fdf24ae154e461faab685
Author: mano-wii
Date:   Tue Aug 20 19:18:25 2019 -0300
Branches: master
https://developer.blender.org/rBdd08d68df835e54ccd1fdf24ae154e461faab685

Transform: New Snap Option: Edge Perpendicular

Part of T66420

Option for snapping to the nearest point of a reference coordinate.
The patch also adds Edge Center and Perpendicular snaps to the ruler.

{F7675906}

Reviewers: campbellbarton, brecht

Reviewed By: campbellbarton

Differential Revision: https://developer.blender.org/D5543

===================================================================

M	release/datafiles/blender_icons.svg
A	release/datafiles/blender_icons16/icon16_snap_perpendicular.dat
A	release/datafiles/blender_icons32/icon32_snap_perpendicular.dat
M	source/blender/editors/curve/editcurve.c
M	source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
M	source/blender/editors/include/ED_transform_snap_object_context.h
M	source/blender/editors/include/UI_icons.h
M	source/blender/editors/mesh/editmesh_tools.c
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M	source/blender/editors/transform/transform_snap.c
M	source/blender/editors/transform/transform_snap_object.c
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 46e78fe7061..c34657bc231 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -5295,6 +5295,14 @@
       <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing: [...]
       <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing: [...]
     </g>
+    <g id="g12955">
+      <g inkscape:export-ydpi="96" inkscape:export-xdpi="96" inkscape:export-filename="C:\Users\Andrzej Ambroż\Desktop\mtrx.png" transform="translate(-212.98058,-205.92773)" id="g12701-3-4-7" style="display:inline;fill:#ffffff;enable-background:new" />
+      <g id="g12966" transform="translate(-0.69998671,-0.49999787)">
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacin [...]
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacin [...]
+        <path inkscape:connector-curvature="0" d="m 51.401825,168.1 c 10e-7,0.82742 0.670754,1.49817 1.49817,1.49817 0.82742,0 1.498179,-0.67075 1.49818,-1.49817 -1e-6,-0.82742 -0.67076,-1.49817 -1.49818,-1.49817 -0.827416,0 -1.498169,0.67075 -1.49817,1.49817 z" style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1; [...]
+      </g>
+    </g>
   </g>
   <g inkscape:groupmode="layer" id="layer2" inkscape:label="EMPTY ICON TRACKING" style="display:none">
     <g id="g16331" style="fill:#ffcc00">
diff --git a/release/datafiles/blender_icons16/icon16_snap_perpendicular.dat b/release/datafiles/blender_icons16/icon16_snap_perpendicular.dat
new file mode 100644
index 00000000000..02b86db4396
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_snap_perpendicular.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_snap_perpendicular.dat b/release/datafiles/blender_icons32/icon32_snap_perpendicular.dat
new file mode 100644
index 00000000000..2460b0150ab
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_snap_perpendicular.dat differ
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index eebc8893112..d7650db546d 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -5680,6 +5680,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, const wmEvent *event)
           },
           mval,
           NULL,
+          NULL,
           location,
           NULL);
 
diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
index 21f779b72b1..37ee95d5058 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
@@ -283,6 +283,7 @@ static int gizmo_move_modal(bContext *C,
                   .use_occlusion_test = true,
               },
               mval_fl,
+              NULL,
               &dist_px,
               co,
               NULL)) {
diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h
index f27523bb1f8..97bef25dee8 100644
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list