Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2021-02-13 10:39:39 +0300
committerAntonio Vazquez <blendergit@gmail.com>2021-02-13 10:39:39 +0300
commit376eedae164f1ad3dde0b091f6f85f2936ff51ad (patch)
tree8500c256a01c5df896f2cc96d02eb665f37225e1 /source/blender/editors/gpencil
parentfea335fe8bd01675243953e41f59f156e44f1e94 (diff)
parenta9092768c0034ca9736d5a386e3aa5dc3232c4cd (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r--source/blender/editors/gpencil/gpencil_fill.c2
-rw-r--r--source/blender/editors/gpencil/gpencil_paint.c3
-rw-r--r--source/blender/editors/gpencil/gpencil_primitive.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index ff7cefb8776..e1a4f40745c 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -1560,7 +1560,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
}
/* If camera view or view projection, reproject flat to view to avoid perspective effect. */
- if ((!is_depth) && (((align_flag & GP_PROJECT_VIEWSPACE) && is_lock_axis_view) || is_camera)) {
+ if ((!is_depth) && (((align_flag & GP_PROJECT_VIEWSPACE) && is_lock_axis_view) || (is_camera))) {
ED_gpencil_project_stroke_to_view(tgpf->C, tgpf->gpl, gps);
}
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 20bed64178a..33910c057b3 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1087,7 +1087,8 @@ static void gpencil_stroke_newfrombuffer(tGPsdata *p)
}
/* If camera view or view projection, reproject flat to view to avoid perspective effect. */
- if ((!is_depth) && (((align_flag & GP_PROJECT_VIEWSPACE) && is_lock_axis_view) || is_camera)) {
+ if ((!is_depth) &&
+ (((align_flag & GP_PROJECT_VIEWSPACE) && is_lock_axis_view) || (is_camera))) {
ED_gpencil_project_stroke_to_view(p->C, p->gpl, gps);
}
}
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 251aece687a..f347a4fe6b9 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -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 ((!is_depth) && (((align_flag & GP_PROJECT_VIEWSPACE) && is_lock_axis_view) || is_camera)) {
+ if ((!is_depth) && (((align_flag & GP_PROJECT_VIEWSPACE) && is_lock_axis_view) || (is_camera))) {
ED_gpencil_project_stroke_to_view(C, tgpi->gpl, gps);
}