[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58891] trunk/blender/source: code cleanup : replace strncpy -> BLI_strncpy, skip first 2 chars when making a hash from the object name.

[Campbell Barton]

Revision: 58891
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58891
Author:   campbellbarton
Date:     2013-08-04 03:45:30 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
code cleanup: replace strncpy -> BLI_strncpy, skip first 2 chars when making a 
hash from the object name.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
    trunk/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
    trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
    trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c   2013-08-04 
03:43:02 UTC (rev 58890)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c   2013-08-04 
03:45:30 UTC (rev 58891)
@@ -92,10 +92,11 @@
 
        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) {

Modified: trunk/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_weightvgedit.c    
2013-08-04 03:43:02 UTC (rev 58890)
+++ trunk/blender/source/blender/modifiers/intern/MOD_weightvgedit.c    
2013-08-04 03:45:30 UTC (rev 58891)
@@ -253,7 +253,7 @@
                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);
 

Modified: trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c       
2013-08-04 03:43:02 UTC (rev 58890)
+++ trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c       
2013-08-04 03:45:30 UTC (rev 58891)
@@ -216,7 +216,7 @@
                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);
 

Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp      
2013-08-04 03:43:02 UTC (rev 58890)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp      
2013-08-04 03:45:30 UTC (rev 58891)
@@ -1143,7 +1143,7 @@
        
        /* 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);

Modified: trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2013-08-04 
03:43:02 UTC (rev 58890)
+++ trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2013-08-04 
03:45:30 UTC (rev 58891)
@@ -49,7 +49,7 @@
 #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 @@
                        }
                }
 
-               MEM_freeN(allVerts);
+               MEM_SAFE_FREE(allVerts);
        }
        else
        {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs