code cleanup: replace strncpy -> BLI_strncpy, skip first 2 chars when making a hash from the object name.

5 files changed, 9 insertions, 8 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);
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 7a53144657d..98af99825e1 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -1143,7 +1143,7 @@ KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openl
 	
 	/* needed for lookups*/
 	GetMainDynamic().push_back(main_newlib);
-	strncpy(main_newlib->name, path, sizeof(main_newlib->name));
+	BLI_strncpy(main_newlib->name, path, sizeof(main_newlib->name));
 	
 	
 	status = new KX_LibLoadStatus(this, m_ketsjiEngine, scene_merge, path);
diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp
index bf9c6ddb442..e45346db9c7 100644
--- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp
+++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp
@@ -49,7 +49,7 @@ extern "C" {
 #include "DetourStatNavMeshBuilder.h"
 #include "KX_ObstacleSimulation.h"
 
-static const int MAX_PATH_LEN = 256;
+#define MAX_PATH_LEN 256
 static const float polyPickExt[3] = {2, 4, 2};
 
 static void calcMeshBounds(const float* vert, int nverts, float* bmin, float* bmax)
@@ -214,7 +214,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts,
 			}
 		}
 
-		MEM_freeN(allVerts);
+		MEM_SAFE_FREE(allVerts);
 	}
 	else
 	{