[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60252] trunk/blender: remove unused modifier argument from ParticleSystem.co_hair

[Campbell Barton]

Revision: 60252
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60252
Author:   campbellbarton
Date:     2013-09-20 06:20:07 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
remove unused modifier argument from ParticleSystem.co_hair

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_curves.cpp
    trunk/blender/source/blender/makesrna/intern/rna_particle.c

Modified: trunk/blender/intern/cycles/blender/blender_curves.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-09-20 05:30:37 UTC (rev 60251)
+++ trunk/blender/intern/cycles/blender/blender_curves.cpp	2013-09-20 06:20:07 UTC (rev 60252)
@@ -217,8 +217,8 @@
 					float3 pcKey;
 					for(int step_no = 0; step_no <= ren_step; step_no++) {
 						float nco[3];
-						b_psys.co_hair(*b_ob, psmd, pa_no, step_no, nco);
-						float3 cKey = make_float3(nco[0],nco[1],nco[2]);
+						b_psys.co_hair(*b_ob, pa_no, step_no, nco);
+						float3 cKey = make_float3(nco[0], nco[1], nco[2]);
 						cKey = transform_point(&itfm, cKey);
 						if(step_no > 0)
 							curve_length += len(cKey - pcKey);

Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c	2013-09-20 05:30:37 UTC (rev 60251)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c	2013-09-20 06:20:07 UTC (rev 60252)
@@ -312,7 +312,7 @@
 	r_uv[1] = 0.0f;
 }
 
-static void rna_ParticleSystem_co_hair(ParticleSystem *particlesystem, Object *object, ParticleSystemModifierData *modifier,
+static void rna_ParticleSystem_co_hair(ParticleSystem *particlesystem, Object *object,
                                        int particle_no, int step, float n_co[3])
 {
 	ParticleSettings *part = 0;
@@ -862,7 +862,8 @@
 	ParticleSettings *settings = (ParticleSettings *)ptr->data;
 	return settings->draw_line[0];
 }
-static void rna_PartSetting_pathstartend_range(PointerRNA *ptr, float *min, float *max, float *softmin, float *softmax)
+static void rna_PartSetting_pathstartend_range(PointerRNA *ptr, float *min, float *max,
+                                               float *UNUSED(softmin), float *UNUSED(softmax))
 {
 	ParticleSettings *settings = (ParticleSettings *)ptr->data;
 
@@ -919,7 +920,7 @@
 	return rna_pointer_inherit_refine(ptr, &RNA_ParticleTarget, NULL);
 }
 static void rna_ParticleSystem_active_particle_target_index_range(PointerRNA *ptr, int *min, int *max,
-                                                                  int *softmin, int *softmax)
+                                                                  int *UNUSED(softmin), int *UNUSED(softmax))
 {
 	ParticleSystem *psys = (ParticleSystem *)ptr->data;
 	*min = 0;
@@ -1041,7 +1042,8 @@
 	}
 	return rna_pointer_inherit_refine(ptr, &RNA_ParticleTarget, NULL);
 }
-static void rna_ParticleDupliWeight_active_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
+static void rna_ParticleDupliWeight_active_index_range(PointerRNA *ptr, int *min, int *max,
+                                                       int *UNUSED(softmin), int *UNUSED(softmax))
 {
 	ParticleSettings *part = (ParticleSettings *)ptr->id.data;
 	*min = 0;
@@ -3414,8 +3416,6 @@
 
 	prop = RNA_def_pointer(func, "object", "Object", "", "Object");
 	RNA_def_property_flag(prop, PROP_REQUIRED | PROP_NEVER_NULL);
-	prop = RNA_def_pointer(func, "modifier", "ParticleSystemModifier", "", "Particle modifier");
-	RNA_def_property_flag(prop, PROP_REQUIRED | PROP_NEVER_NULL);
 	prop = RNA_def_int(func, "particle_no", 0, INT_MIN, INT_MAX, "Particle no", "", INT_MIN, INT_MAX);
 	prop = RNA_def_int(func, "step", 0, INT_MIN, INT_MAX, "step no", "", INT_MIN, INT_MAX);