[Bf-blender-cvs] [6bdbbcd683a] master: Workaround for missing hair after opening the file

Sergey Sharybin noreply at git.blender.org
Fri Feb 1 15:40:49 CET 2019


Commit: 6bdbbcd683aff6a034e6a1e86915a1aafa3d1051
Author: Sergey Sharybin
Date:   Fri Feb 1 15:38:22 2019 +0100
Branches: master
https://developer.blender.org/rB6bdbbcd683aff6a034e6a1e86915a1aafa3d1051

Workaround for missing hair after opening the file

Restore reset on file open, at least for now.

===================================================================

M	source/blender/modifiers/intern/MOD_particlesystem.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c
index ce5b3422f98..e654a93a217 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -127,6 +127,9 @@ static void deformVerts(
 	else if (psmd->flag & eParticleSystemFlag_file_loaded) {
 		/* in file read mesh just wasn't saved in file so no need to reset everything */
 		psmd->flag &= ~eParticleSystemFlag_file_loaded;
+		/* TODO(sergey): With copy-on-write this is more like duplicating an
+		 * object which does need to reset particles. */
+		psys->recalc |= ID_RECALC_PSYS_RESET;
 	}
 	else {
 		/* no dm before, so recalc particles fully */



More information about the Bf-blender-cvs mailing list