[Bf-blender-cvs] [a3714542f86] lineart-shadow: LineArt: Back face culling auto for shadow scenes.
YimingWu
noreply at git.blender.org
Tue Aug 17 05:53:15 CEST 2021
Commit: a3714542f8601d03251a8898f70dab0779ed1152
Author: YimingWu
Date: Mon Aug 16 13:58:06 2021 +0800
Branches: lineart-shadow
https://developer.blender.org/rBa3714542f8601d03251a8898f70dab0779ed1152
LineArt: Back face culling auto for shadow scenes.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 4833954c0ac..8a05b618f03 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4833954c0ac85cc407e1d5a153aa11b1d1823ec0
+Subproject commit 8a05b618f031582c006c6f62b9e60619ab3eef8b
diff --git a/release/scripts/addons b/release/scripts/addons
index f86f25e6221..67f1fbca148 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f86f25e62217264495d05f116ccb09d575fe9841
+Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 5a82baad9f9..ef6ef414d22 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 5a82baad9f986722104280e8354a4427d8e9eab1
+Subproject commit ef6ef414d22c2578fad99327743b925ab640a99c
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 1058eae2d86..4dc8dfb7803 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -3243,14 +3243,6 @@ static LineartRenderBuffer *lineart_create_render_buffer(Scene *scene,
* occlusion levels will get ignored. */
rb->max_occlusion_level = lmd->level_end_override;
- rb->use_back_face_culling = (lmd->calculation_flags & LRT_USE_BACK_FACE_CULLING) != 0;
- if (rb->max_occlusion_level < 1 && !rb->use_shadow) {
- rb->use_back_face_culling = true;
- if (G.debug_value == 4000) {
- printf("Backface culling enabled automatically.\n");
- }
- }
-
int16_t edge_types = lmd->edge_types_override;
/* lmd->edge_types_override contains all used flags in the modifier stack. */
@@ -3265,6 +3257,14 @@ static LineartRenderBuffer *lineart_create_render_buffer(Scene *scene,
rb->use_shadow = ((edge_types & LRT_EDGE_FLAG_PROJECTED_SHADOW) != 0 &&
(lmd->light_contour_object != NULL));
+ rb->use_back_face_culling = (lmd->calculation_flags & LRT_USE_BACK_FACE_CULLING) != 0;
+ if (rb->max_occlusion_level < 1 && !rb->use_shadow) {
+ rb->use_back_face_culling = true;
+ if (G.debug_value == 4000) {
+ printf("Backface culling enabled automatically.\n");
+ }
+ }
+
rb->filter_face_mark_invert = (lmd->calculation_flags & LRT_FILTER_FACE_MARK_INVERT) != 0;
rb->filter_face_mark = (lmd->calculation_flags & LRT_FILTER_FACE_MARK) != 0;
rb->filter_face_mark_boundaries = (lmd->calculation_flags & LRT_FILTER_FACE_MARK_BOUNDARIES) !=
diff --git a/source/tools b/source/tools
index 01f51a0e551..5cf2fc3e5dc 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f
+Subproject commit 5cf2fc3e5dc28025394b57d8743401295528f310
More information about the Bf-blender-cvs
mailing list