[Bf-blender-cvs] [df2e543] temp_remove_particles: Removed some unused declarations for boids code.

Lukas Tönne noreply at git.blender.org
Sat Apr 16 12:12:28 CEST 2016


Commit: df2e543d4431c1d4f0003b5fbc4cf9ee98a2f7da
Author: Lukas Tönne
Date:   Sat Apr 16 11:11:39 2016 +0200
Branches: temp_remove_particles
https://developer.blender.org/rBdf2e543d4431c1d4f0003b5fbc4cf9ee98a2f7da

Removed some unused declarations for boids code.

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

M	source/blender/blenkernel/BKE_effect.h
M	source/blender/blenkernel/intern/effect.c
M	source/blender/makesrna/RNA_access.h
M	source/blender/makesrna/RNA_enum_types.h

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

diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index d3606e1..6d6740c 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -113,8 +113,6 @@ void            pdDoEffectors(struct ListBase *effectors, struct ListBase *colli
 void pd_point_from_loc(struct Scene *scene, float *loc, float *vel, int index, struct EffectedPoint *point);
 void pd_point_from_soft(struct Scene *scene, float *loc, float *vel, int index, struct EffectedPoint *point);
 
-/* needed for boids */
-float effector_falloff(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, struct EffectorWeights *weights);
 int closest_point_on_surface(SurfaceModifierData *surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]);
 int get_effector_data(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, int real_velocity);
 
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 38753f0..66e3720 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -412,7 +412,7 @@ static float falloff_func_rad(PartDeflect *pd, float fac)
 	return falloff_func(fac, pd->flag&PFIELD_USEMINR, pd->minrad, pd->flag&PFIELD_USEMAXR, pd->maxrad, pd->f_power_r);
 }
 
-float effector_falloff(EffectorCache *eff, EffectorData *efd, EffectedPoint *UNUSED(point), EffectorWeights *weights)
+static float effector_falloff(EffectorCache *eff, EffectorData *efd, EffectedPoint *UNUSED(point), EffectorWeights *weights)
 {
 	float temp[3];
 	float falloff = weights ? weights->weight[0] * weights->weight[eff->pd->forcefield] : 1.0f;
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index cce2582..0c7c3d4 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -78,15 +78,6 @@ extern StructRNA RNA_BezierSplinePoint;
 extern StructRNA RNA_BlendData;
 extern StructRNA RNA_BlendTexture;
 extern StructRNA RNA_BlenderRNA;
-extern StructRNA RNA_BoidRule;
-extern StructRNA RNA_BoidRuleAverageSpeed;
-extern StructRNA RNA_BoidRuleAvoid;
-extern StructRNA RNA_BoidRuleAvoidCollision;
-extern StructRNA RNA_BoidRuleFight;
-extern StructRNA RNA_BoidRuleFollowLeader;
-extern StructRNA RNA_BoidRuleGoal;
-extern StructRNA RNA_BoidSettings;
-extern StructRNA RNA_BoidState;
 extern StructRNA RNA_Bone;
 extern StructRNA RNA_BoneGroup;
 extern StructRNA RNA_BooleanModifier;
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index b1048f7..f76e50b 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -58,7 +58,6 @@ extern EnumPropertyItem rna_enum_space_type_items[];
 extern EnumPropertyItem rna_enum_region_type_items[];
 extern EnumPropertyItem rna_enum_object_modifier_type_items[];
 extern EnumPropertyItem rna_enum_constraint_type_items[];
-extern EnumPropertyItem rna_enum_boidrule_type_items[];
 extern EnumPropertyItem rna_enum_sequence_modifier_type_items[];
 
 extern EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[];




More information about the Bf-blender-cvs mailing list