From c41431f1e9e75a424717b4080434b940c2685c20 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 4 Jan 2015 14:20:31 +1100 Subject: cleanup: use 'coords' abbreviation for functions. --- source/blender/blenkernel/BKE_brush.h | 2 +- source/blender/blenkernel/BKE_particle.h | 2 +- source/blender/blenkernel/intern/brush.c | 2 +- source/blender/blenkernel/intern/particle_system.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 42379c02e89..49975fa0276 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -62,7 +62,7 @@ int BKE_brush_clone_image_delete(struct Brush *brush); /* jitter */ void BKE_brush_jitter_pos(const struct Scene *scene, struct Brush *brush, const float pos[2], float jitterpos[2]); -void BKE_brush_randomize_texture_coordinates(struct UnifiedPaintSettings *ups, bool mask); +void BKE_brush_randomize_texture_coords(struct UnifiedPaintSettings *ups, bool mask); /* brush curve */ void BKE_brush_curve_preset(struct Brush *b, int preset); diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 204fbbf5bfc..39cf5505382 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -364,7 +364,7 @@ void psys_get_pointcache_start_end(struct Scene *scene, ParticleSystem *psys, in void psys_check_boid_data(struct ParticleSystem *psys); -void psys_get_birth_coordinates(struct ParticleSimulationData *sim, struct ParticleData *pa, struct ParticleKey *state, float dtime, float cfra); +void psys_get_birth_coords(struct ParticleSimulationData *sim, struct ParticleData *pa, struct ParticleKey *state, float dtime, float cfra); void particle_system_update(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 0a57dc5c945..7c1915ea225 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -949,7 +949,7 @@ void BKE_brush_jitter_pos(const Scene *scene, Brush *brush, const float pos[2], jitterpos[1] = pos[1] + 2 * rand_pos[1] * diameter * spread; } -void BKE_brush_randomize_texture_coordinates(UnifiedPaintSettings *ups, bool mask) +void BKE_brush_randomize_texture_coords(UnifiedPaintSettings *ups, bool mask) { /* we multiply with brush radius as an optimization for the brush * texture sampling functions */ diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 7ad99c14565..3705fb11125 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1670,7 +1670,7 @@ static void get_angular_velocity_vector(short avemode, ParticleKey *state, float } } -void psys_get_birth_coordinates(ParticleSimulationData *sim, ParticleData *pa, ParticleKey *state, float dtime, float cfra) +void psys_get_birth_coords(ParticleSimulationData *sim, ParticleData *pa, ParticleKey *state, float dtime, float cfra) { Object *ob = sim->ob; ParticleSystem *psys = sim->psys; @@ -2002,7 +2002,7 @@ void reset_particle(ParticleSimulationData *sim, ParticleData *pa, float dtime, psys->flag |= PSYS_OB_ANIM_RESTORE; } - psys_get_birth_coordinates(sim, pa, &pa->state, dtime, cfra); + psys_get_birth_coords(sim, pa, &pa->state, dtime, cfra); /* Initialize particle settings which depends on texture. * -- cgit v1.2.3