Merge branch 'blender-v2.92-release'
This commit is contained in:
commit
cdb8209b35
|
@ -1154,8 +1154,8 @@ static int gpencil_points_from_stack(tGPDfill *tgpf)
|
|||
static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
|
||||
{
|
||||
ToolSettings *ts = tgpf->scene->toolsettings;
|
||||
const char *align_flag = &ts->gpencil_v3d_align;
|
||||
const bool is_depth = (bool)(*align_flag & (GP_PROJECT_DEPTH_VIEW | GP_PROJECT_DEPTH_STROKE));
|
||||
const char align_flag = ts->gpencil_v3d_align;
|
||||
const bool is_depth = (bool)(align_flag & (GP_PROJECT_DEPTH_VIEW | GP_PROJECT_DEPTH_STROKE));
|
||||
const bool is_camera = (bool)(ts->gp_sculpt.lock_axis == 0) &&
|
||||
(tgpf->rv3d->persp == RV3D_CAMOB) && (!is_depth);
|
||||
Brush *brush = BKE_paint_brush(&ts->gp_paint->paint);
|
||||
|
@ -1285,7 +1285,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
|
|||
}
|
||||
|
||||
/* If camera view or view projection, reproject flat to view to avoid perspective effect. */
|
||||
if ((*p->align_flag & GP_PROJECT_VIEWSPACE) || is_camera) {
|
||||
if ((align_flag & GP_PROJECT_VIEWSPACE) || is_camera) {
|
||||
ED_gpencil_project_stroke_to_view(tgpf->C, tgpf->gpl, gps);
|
||||
}
|
||||
|
||||
|
|
|
@ -715,8 +715,8 @@ static void gpencil_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
|
|||
bGPDstroke *gps = tgpi->gpf->strokes.first;
|
||||
GP_Sculpt_Settings *gset = &ts->gp_sculpt;
|
||||
int depth_margin = (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 4 : 0;
|
||||
const char *align_flag = &ts->gpencil_v3d_align;
|
||||
bool is_depth = (bool)(*align_flag & (GP_PROJECT_DEPTH_VIEW | GP_PROJECT_DEPTH_STROKE));
|
||||
const char align_flag = ts->gpencil_v3d_align;
|
||||
bool is_depth = (bool)(align_flag & (GP_PROJECT_DEPTH_VIEW | GP_PROJECT_DEPTH_STROKE));
|
||||
const bool is_camera = (bool)(ts->gp_sculpt.lock_axis == 0) &&
|
||||
(tgpi->rv3d->persp == RV3D_CAMOB) && (!is_depth);
|
||||
|
||||
|
@ -1082,7 +1082,7 @@ static void gpencil_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
|
|||
}
|
||||
|
||||
/* If camera view or view projection, reproject flat to view to avoid perspective effect. */
|
||||
if ((*p->align_flag & GP_PROJECT_VIEWSPACE) || is_camera) {
|
||||
if ((align_flag & GP_PROJECT_VIEWSPACE) || is_camera) {
|
||||
ED_gpencil_project_stroke_to_view(C, tgpi->gpl, gps);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue