[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13679] trunk/blender/source/blender: Particles' angular velocity mode "velocity" was actually just a duplicate of "spin" without any angular velocity, so it was removed.
Janne Karhu
jhkarh at utu.fi
Wed Feb 13 22:06:38 CET 2008
Revision: 13679
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13679
Author: jhk
Date: 2008-02-13 22:06:37 +0100 (Wed, 13 Feb 2008)
Log Message:
-----------
Particles' angular velocity mode "velocity" was actually just a duplicate of "spin" without any angular velocity, so it was removed.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/makesdna/DNA_particle_types.h
trunk/blender/source/blender/src/buttons_object.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2008-02-13 20:42:36 UTC (rev 13678)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2008-02-13 21:06:37 UTC (rev 13679)
@@ -2875,7 +2875,7 @@
float rotfac, rot1[4], rot2[4]={1.0,0.0,0.0,0.0}, dtime=dfra*timestep;
if((part->flag & PART_ROT_DYN)==0){
- if(ELEM(part->avemode,PART_AVE_SPIN,PART_AVE_VEL)){
+ if(part->avemode==PART_AVE_SPIN){
float angle;
float len1 = VecLength(pa->state.vel);
float len2 = VecLength(state->vel);
@@ -2888,10 +2888,9 @@
angle=Inpf(pa->state.vel,state->vel)/(len1*len2);
VecMulf(state->ave,saacos(angle)/dtime);
}
- }
- if(part->avemode == PART_AVE_SPIN)
VecRotToQuat(state->vel,dtime*part->avefac,rot2);
+ }
}
rotfac=VecLength(state->ave);
Modified: trunk/blender/source/blender/makesdna/DNA_particle_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_particle_types.h 2008-02-13 20:42:36 UTC (rev 13678)
+++ trunk/blender/source/blender/makesdna/DNA_particle_types.h 2008-02-13 21:06:37 UTC (rev 13679)
@@ -365,7 +365,6 @@
/* part->avemode */
#define PART_AVE_SPIN 1
#define PART_AVE_RAND 2
-#define PART_AVE_VEL 3
/* part->reactevent */
#define PART_EVENT_DEATH 0
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2008-02-13 20:42:36 UTC (rev 13678)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-02-13 21:06:37 UTC (rev 13679)
@@ -4513,7 +4513,7 @@
uiDefButF(block, NUM, B_PART_RECALC, "Rand:", butx+butw/2,buty,butw/2,buth*4/5, &part->randphasefac, 0.0, 1.0, 1, 3, "Randomize rotation phase");
uiBlockSetCol(block, TH_AUTO);
- uiDefButS(block, MENU, B_PART_RECALC, "Angular v %t|Velocity%x3|Random%x2|Spin%x1|None%x0", butx,(buty-=buth*4/5),butw,buth*4/5, &part->avemode, 14.0, 0.0, 0, 0, "Select particle angular velocity mode");
+ uiDefButS(block, MENU, B_PART_RECALC, "Angular v %t|Random%x2|Spin%x1|None%x0", butx,(buty-=buth*4/5),butw,buth*4/5, &part->avemode, 14.0, 0.0, 0, 0, "Select particle angular velocity mode");
uiBlockSetCol(block, TH_BUT_SETTING2);
if(ELEM(part->avemode,PART_AVE_RAND,PART_AVE_SPIN))
uiDefButF(block, NUM, B_PART_RECALC, "Angular v:", butx,(buty-=buth*4/5),butw,buth*4/5, &part->avefac, -200.0, 200.0, 1, 3, "Angular velocity amount");
More information about the Bf-blender-cvs
mailing list