remove unused modifier argument from ParticleSystem.co_hair
authorCampbell Barton <ideasman42@gmail.com>
Fri, 20 Sep 2013 06:20:07 +0000 (06:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 20 Sep 2013 06:20:07 +0000 (06:20 +0000)
intern/cycles/blender/blender_curves.cpp
source/blender/makesrna/intern/rna_particle.c

index 57ef9a1005c1d704a4bea418b768a6ad0f4a0e16..1cddc25a22b2d328a6002b1094bd7c9f3397eefc 100644 (file)
@@ -217,8 +217,8 @@ bool ObtainCacheParticleData(Mesh *mesh, BL::Mesh *b_mesh, BL::Object *b_ob, Par
                                        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);
index 71b7cdae098331735193bc7b351b9f33cb7e4b79..8dafe54e678d122a043f8927b00986f8bb2c6b61 100644 (file)
@@ -312,7 +312,7 @@ static void rna_Particle_uv_on_emitter(ParticleData *particle, ReportList *repor
        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 @@ static float rna_PartSetting_linelentail_get(struct PointerRNA *ptr)
        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 @@ static PointerRNA rna_ParticleSystem_active_particle_target_get(PointerRNA *ptr)
        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 @@ static PointerRNA rna_ParticleDupliWeight_active_get(PointerRNA *ptr)
        }
        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 @@ static void rna_def_particle_system(BlenderRNA *brna)
 
        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);