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>2017-02-07 16:21:29 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-02-07 16:21:29 +0300
commit03544eccb40daaf0d48fc8272ed7d392b7e29a31 (patch)
tree9cabdacc0aabc5ea36601d78a015e1d0a3a5debf /source/blender/blenkernel/intern/particle.c
parent53896d4235d883f39d4b02119419c462ab65a3a7 (diff)
Fix missing hair after rendering with different viewport/render settings
Derived mesh for particles did not include tessellated faces when it was expected to. Now added explicit function to copy CDDM with tess faces without need to re-tessellate the result.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r--source/blender/blenkernel/intern/particle.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 1ea27558545..228ae6afaba 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -633,8 +633,9 @@ void psys_render_set(Object *ob, ParticleSystem *psys, float viewmat[4][4], floa
data->childcachebufs.last = psys->childcachebufs.last;
data->totchildcache = psys->totchildcache;
- if (psmd->dm_final)
- data->dm = CDDM_copy(psmd->dm_final);
+ if (psmd->dm_final) {
+ data->dm = CDDM_copy_with_tessface(psmd->dm_final);
+ }
data->totdmvert = psmd->totdmvert;
data->totdmedge = psmd->totdmedge;
data->totdmface = psmd->totdmface;