griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release' into main

Browse Source
This commit is contained in:
Germano Cavalcante
2023-10-20 09:56:13 -03:00
parent a4f7526847 b657a35e8f
commit 0343e0bd65
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/curve/editcurve.cc
View File

@@ -5621,7 +5621,8 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, const wmEvent *event)
Curve *cu;
float location[3];
const bool use_proj = ((vc.scene->toolsettings->snap_flag & SCE_SNAP) &&
(vc.scene->toolsettings->snap_mode == SCE_SNAP_TO_FACE));
(vc.scene->toolsettings->snap_mode &
(SCE_SNAP_TO_FACE | SCE_SNAP_INDIVIDUAL_PROJECT)));
Nurb *nu;
BezTriple *bezt;

3
source/blender/editors/mesh/editmesh_extrude.cc
View File

@@ -713,7 +713,8 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
const bool rot_src = RNA_boolean_get(op->ptr, "rotate_source");
const bool use_proj = ((vc.scene->toolsettings->snap_flag & SCE_SNAP) &&
(vc.scene->toolsettings->snap_mode == SCE_SNAP_TO_FACE));
(vc.scene->toolsettings->snap_mode &
(SCE_SNAP_TO_FACE | SCE_SNAP_INDIVIDUAL_PROJECT)));
/* First calculate the center of transformation. */
zero_v3(center);