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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-03-13 20:04:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-03-13 20:35:32 +0300
commit18a9e0776c2e9400449a43f28707cc3e62b0c160 (patch)
tree764b832367fd4f3338fecb7e142605d9f69a3850 /source/blender/draw/modes
parent1c9e898e8fdd25bbc41400b6833d9d5ebe80b2d5 (diff)
Fix T62156: Hair particle only shows up in final render when visible in viewport
Draw manager was checking for particles being enabled in viewport, but actual evaluation was happening for render. Now the check in draw manager properly follows current evaluation mode. Additionally, de-duplicated some check, by moving everything needed to a single place. Annoying part is the const-cast, that could be cleaned up later by modifying some underlying functions.
Diffstat (limited to 'source/blender/draw/modes')
-rw-r--r--source/blender/draw/modes/object_mode.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 1a7e9e40d6d..f73aacf15d2 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2803,9 +2803,6 @@ static void OBJECT_cache_populate_particles(
OBJECT_PassList *psl)
{
for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) {
- if (!psys_check_enabled(ob, psys, false)) {
- continue;
- }
if (!DRW_object_is_visible_psys_in_active_context(ob, psys)) {
continue;
}