Commit: 72cfd5134be8a74b59b41574bebf3f095aa8704a
Author: Sergey Sharybin
Date: Thu Jun 7 10:12:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB72cfd5134be8a74b59b41574bebf3f095aa8704a
Draw: Use proper continue when psys is disabled
===================================================================
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/engines/clay/clay_engine.c
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/modes/object_mode.c
===================================================================
diff --git a/source/blender/draw/engines/basic/basic_engine.c
b/source/blender/draw/engines/basic/basic_engine.c
index c86574f7557..2c771578514 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -155,7 +155,7 @@ static void basic_cache_populate(void *vedata, Object *ob)
continue;
}
if (!DRW_check_psys_visible_within_active_context(ob, psys)) {
- return;
+ continue;
}
ParticleSettings *part = psys->part;
const int draw_as = (part->draw_as == PART_DRAW_REND) ?
part->ren_as : part->draw_as;
diff --git a/source/blender/draw/engines/clay/clay_engine.c
b/source/blender/draw/engines/clay/clay_engine.c
index d08fee6039f..5d3717097b1 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -838,7 +838,7 @@ static void clay_cache_populate_particles(void *vedata,
Object *ob)
continue;
}
if (!DRW_check_psys_visible_within_active_context(ob, psys)) {
- return;
+ continue;
}
ParticleSettings *part = psys->part;
const int draw_as = (part->draw_as == PART_DRAW_REND) ?
part->ren_as : part->draw_as;
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c
b/source/blender/draw/engines/workbench/workbench_deferred.c
index 9e71ba551a1..428e5d4f7c8 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -618,7 +618,7 @@ static void
workbench_cache_populate_particles(WORKBENCH_Data *vedata, Object *o
continue;
}
if (!DRW_check_psys_visible_within_active_context(ob, psys)) {
- return;
+ continue;
}
ParticleSettings *part = psys->part;
const int draw_as = (part->draw_as == PART_DRAW_REND) ?
part->ren_as : part->draw_as;
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c
b/source/blender/draw/engines/workbench/workbench_forward.c
index f313aee30ec..8bd27e18da2 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -457,7 +457,7 @@ static void
workbench_forward_cache_populate_particles(WORKBENCH_Data *vedata, O
continue;
}
if (!DRW_check_psys_visible_within_active_context(ob, psys)) {
- return;
+ continue;
}
ParticleSettings *part = psys->part;
const int draw_as = (part->draw_as == PART_DRAW_REND) ?
part->ren_as : part->draw_as;
diff --git a/source/blender/draw/modes/object_mode.c
b/source/blender/draw/modes/object_mode.c
index ff6fcdb83d2..37a4928cba4 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1992,7 +1992,7 @@ static void OBJECT_cache_populate_particles(Object *ob,
continue;
}
if (!DRW_check_psys_visible_within_active_context(ob, psys)) {
- return;
+ continue;
}
ParticleSettings *part = psys->part;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
