Commit: 2f766f8ad2ad6e1827468cd0e33c30672663e704
Author: Sergey Sharybin
Date: Wed Aug 26 14:27:44 2015 +0200
Branches: master
https://developer.blender.org/rB2f766f8ad2ad6e1827468cd0e33c30672663e704
Fix T45709: Cached Hair system is not seen in 2.75
Don't force re-distribution of cached particle systems, this doesn't
cause actual evaluation of particles and there was a reason why particles
are baked actually..
===================================================================
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_270.c
b/source/blender/blenloader/intern/versioning_270.c
index 1e309f5..6af6a7a 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -42,6 +42,7 @@
#include "DNA_sequence_types.h"
#include "DNA_space_types.h"
#include "DNA_screen_types.h"
+#include "DNA_object_force.h"
#include "DNA_object_types.h"
#include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
@@ -654,7 +655,9 @@ void blo_do_versions_270(FileData *fd, Library
*UNUSED(lib), Main *main)
ParticleSystem *psys;
for (ob = main->object.first; ob; ob = ob->id.next) {
for (psys = ob->particlesystem.first; psys;
psys = psys->next) {
- psys->recalc |= PSYS_RECALC_RESET;
+ if ((psys->pointcache->flag &
PTCACHE_BAKED) == 0) {
+ psys->recalc |=
PSYS_RECALC_RESET;
+ }
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
