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:
authorJanne Karhu <jhkarh@gmail.com>2012-03-19 01:33:00 +0400
committerJanne Karhu <jhkarh@gmail.com>2012-03-19 01:33:00 +0400
commit709ca0ece9b28858cea8084f8040ce0b7455958a (patch)
tree155f9061bdb676283be269767f1f3cb40ddf325f /source/blender/blenkernel/intern/particle_system.c
parent9db821a5db8e45b671af665062732c08c7fc2b13 (diff)
"Fix" for [#30098] Particle rotation wrong / explode modifier
- The main problem was that in order to be accurate all particle rotations have to be calculated incrementally so the only working solution is to store rotations to the point cache (previously this was only done for dynamic rotations). This can nearly double the point cache size so it's not ideal to have this as a default as in many cases you don't care about particle rotations. - Particle rotation panel now has a new "enable" checkbox that enables rotation calculations and the storing of rotations to point cache. - Old files will have rotations enabled via do_versions so that in the worst case old files will only get bigger point caches, but no sudden loss of particle rotations.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 8b34bafc417..c3e7e4531b9 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2684,6 +2684,12 @@ static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, f
{
float rotfac, rot1[4], rot2[4]={1.0,0.0,0.0,0.0}, dtime=dfra*timestep;
+ if((part->flag & PART_ROTATIONS)==0) {
+ pa->state.rot[0]=1.0f;
+ pa->state.rot[1]=pa->state.rot[2]=pa->state.rot[3]=0;
+ return;
+ }
+
if((part->flag & PART_ROT_DYN)==0) {
if(part->avemode==PART_AVE_SPIN) {
float angle;