diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 07:45:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 07:45:30 +0400 |
commit | 93f5e2218a5103e91ff4c3943aec3bc3d6f9c69e (patch) | |
tree | 023faff5996a38655b1cab90396469be00e733cd /source/blender | |
parent | 4bd60205fbdd7935fdda8f2d6f75e6ce3eb17c8f (diff) |
code cleanup: replace strncpy -> BLI_strncpy, skip first 2 chars when making a hash from the object name.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers.c | 7 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgedit.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index 04edec01a5c..80b85ab6edd 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -92,10 +92,11 @@ void BMW_init(BMWalker *walker, BMesh *bm, int type, if (UNLIKELY(type >= BMW_MAXWALKERS || type < 0)) { fprintf(stderr, - "Invalid walker type in BMW_init; type: %d, " + "%s: Invalid walker type in BMW_init; type: %d, " "searchmask: (v:%d, e:%d, f:%d), flag: %d, layer: %d\n", - type, mask_vert, mask_edge, mask_face, flag, layer); - BMESH_ASSERT(0); + __func__, type, mask_vert, mask_edge, mask_face, flag, layer); + BLI_assert(0); + return; } if (type != BMW_CUSTOM) { diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index 959e4d4f59d..c8da0eb6de7 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -253,7 +253,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der RNG *rng = NULL; if (wmd->falloff_type == MOD_WVG_MAPPING_RANDOM) - rng = BLI_rng_new_srandom(BLI_ghashutil_strhash(ob->id.name)); + rng = BLI_rng_new_srandom(BLI_ghashutil_strhash(ob->id.name + 2)); weightvg_do_map(numVerts, new_w, wmd->falloff_type, wmd->cmap_curve, rng); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index f0e9a26f10a..63267538528 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -216,7 +216,7 @@ static void do_map(Object *ob, float *weights, const int nidx, const float min_d RNG *rng = NULL; if (mode == MOD_WVG_MAPPING_RANDOM) - rng = BLI_rng_new_srandom(BLI_ghashutil_strhash(ob->id.name)); + rng = BLI_rng_new_srandom(BLI_ghashutil_strhash(ob->id.name + 2)); weightvg_do_map(nidx, weights, mode, NULL, rng); |