Revision: 23575
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23575
Author: jhk
Date: 2009-10-01 00:57:58 +0200 (Thu, 01 Oct 2009)
Log Message:
-----------
Fixing a compile error from last commit and some warnings that msvc didn't care
to let me know about.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_effect.h
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/particle.c
Modified: trunk/blender/source/blender/blenkernel/BKE_effect.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_effect.h 2009-09-30
22:10:14 UTC (rev 23574)
+++ trunk/blender/source/blender/blenkernel/BKE_effect.h 2009-09-30
22:57:58 UTC (rev 23575)
@@ -41,6 +41,9 @@
struct Particle;
struct Group;
struct RNG;
+struct ParticleSimulationData;
+struct ParticleData;
+struct ParticleKey;
struct EffectorWeights *BKE_add_effector_weights(struct Group *group);
struct PartDeflect *object_add_collision_fields(int type);
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2009-09-30
22:10:14 UTC (rev 23574)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2009-09-30
22:57:58 UTC (rev 23575)
@@ -559,7 +559,6 @@
for(; psys; psys=psys->next) {
BoidRule *rule = NULL;
BoidState *state = NULL;
- ParticleSimulationData sim = {scene, ob, psys, NULL,
NULL};
ParticleSettings *part= psys->part;
ListBase *effectors = NULL;
EffectorCache *eff;
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2009-09-30
22:10:14 UTC (rev 23574)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2009-09-30
22:57:58 UTC (rev 23575)
@@ -819,7 +819,7 @@
RNG *rng = pd->rng;
float force[3]={0,0,0};
float temp[3];
- float noise = 0, fac;
+ float fac;
float strength = pd->f_strength;
float damp = pd->f_damp;
float noise_factor = pd->f_noise;
@@ -970,7 +970,7 @@
*/
EffectorCache *eff;
EffectorData efd;
- int i=0, p=0, tot = 1;
+ int p=0, tot = 1;
/* Cycle through collected objects, get total of (1/(gravity_strength *
dist^gravity_power)) */
/* Check for min distance here? (yes would be cool to add that, ton) */
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2009-09-30
22:10:14 UTC (rev 23574)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2009-09-30
22:57:58 UTC (rev 23575)
@@ -1960,11 +1960,11 @@
if(pd->flag & PFIELD_GUIDE_PATH_ADD) {
if(where_on_path(eff->ob, data->strength * guidetime,
guidevec, guidedir, NULL, &radius)==0)
- return;
+ return 0;
}
else {
if(where_on_path(eff->ob, guidetime, guidevec,
guidedir, NULL, &radius)==0)
- return;
+ return 0;
}
Mat4MulVecfl(eff->ob->obmat, guidevec);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
