[Bf-blender-cvs] [c41431f] master: cleanup: use 'coords' abbreviation for functions.

Campbell Barton noreply at git.blender.org
Sun Jan 4 04:24:09 CET 2015


Commit: c41431f1e9e75a424717b4080434b940c2685c20
Author: Campbell Barton
Date:   Sun Jan 4 14:20:31 2015 +1100
Branches: master
https://developer.blender.org/rBc41431f1e9e75a424717b4080434b940c2685c20

cleanup: use 'coords' abbreviation for functions.

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

M	source/blender/blenkernel/BKE_brush.h
M	source/blender/blenkernel/BKE_particle.h
M	source/blender/blenkernel/intern/brush.c
M	source/blender/blenkernel/intern/particle_system.c
M	source/blender/editors/sculpt_paint/paint_stroke.c
M	source/blender/modifiers/intern/MOD_explode.c

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

diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index 42379c0..49975fa 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 204fbbf..39cf550 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 0a57dc5..7c1915e 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 7ad99c1..3705fb1 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.
 	 *
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c
index 02a2893..bb875d2 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -263,7 +263,7 @@ static bool paint_brush_update(bContext *C,
 		}
 
 		if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM)
-			BKE_brush_randomize_texture_coordinates(ups, false);
+			BKE_brush_randomize_texture_coords(ups, false);
 		else {
 			copy_v2_v2(ups->tex_mouse, mouse);
 		}
@@ -271,7 +271,7 @@ static bool paint_brush_update(bContext *C,
 		/* take care of mask texture, if any */
 		if (brush->mask_mtex.tex) {
 			if (brush->mask_mtex.brush_map_mode == MTEX_MAP_MODE_RANDOM)
-				BKE_brush_randomize_texture_coordinates(ups, true);
+				BKE_brush_randomize_texture_coords(ups, true);
 			else {
 				copy_v2_v2(ups->mask_tex_mouse, mouse);
 			}
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 86e9dc7..32a6303 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -891,7 +891,7 @@ static DerivedMesh *explodeMesh(ExplodeModifierData *emd,
 			/* get particle */
 			pa = pars + ed_v2;
 
-			psys_get_birth_coordinates(&sim, pa, &birth, 0, 0);
+			psys_get_birth_coords(&sim, pa, &birth, 0, 0);
 
 			state.time = cfra;
 			psys_get_particle_state(&sim, ed_v2, &state, 1);




More information about the Bf-blender-cvs mailing list