[Bf-blender-cvs] [a31b984be78] temp-lineart-contained: LineArt: Move type rejection before visibility check
YimingWu
noreply at git.blender.org
Wed Jun 23 09:54:03 CEST 2021
Commit: a31b984be78bd5bfeb57b465dbb48c7380b49b61
Author: YimingWu
Date: Tue Jun 22 23:03:53 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBa31b984be78bd5bfeb57b465dbb48c7380b49b61
LineArt: Move type rejection before visibility check
===================================================================
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 81ce421d2c9..e0d6e975a09 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -2188,6 +2188,10 @@ static void lineart_main_load_geometries(
mul_m4db_m4db_m4fl_uniq(obi->model_view_proj, rb->view_projection, ob->obmat);
mul_m4db_m4db_m4fl_uniq(obi->model_view, rb->view, ob->obmat);
+ if (!ELEM(use_ob->type, OB_MESH, OB_MBALL, OB_CURVE, OB_SURF, OB_FONT)) {
+ continue;
+ }
+
if (!lineart_geometry_check_visible(obi->model_view_proj, use_ob)) {
if (G.debug_value == 4000) {
bound_box_discard_count++;
@@ -2195,10 +2199,6 @@ static void lineart_main_load_geometries(
continue;
}
- if (!(use_ob->type == OB_MESH || use_ob->type == OB_MBALL || use_ob->type == OB_CURVE ||
- use_ob->type == OB_SURF || use_ob->type == OB_FONT)) {
- continue;
- }
if (use_ob->type == OB_MESH) {
use_mesh = use_ob->data;
}
More information about the Bf-blender-cvs
mailing list