Revision: 17108
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17108
Author: campbellbarton
Date: 2008-10-19 06:02:37 +0200 (Sun, 19 Oct 2008)
Log Message:
-----------
source/blender/blenloader/intern/readfile.c - use memmove rather then strncpy
for overlapping strings.
source/blender/blenlib/intern/fileops.c - zero length strings would check for a
slash before the strings first char.
source/gameengine/GameLogic/SCA_JoystickSensor.cpp - m_istrig_prev was not
initialized
source/blender/src/editmesh.c - active face pointer was not set to NULL in
free_editMesh()
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/src/editmesh.c
trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2008-10-19
03:41:49 UTC (rev 17107)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2008-10-19
04:02:37 UTC (rev 17108)
@@ -95,12 +95,12 @@
void BLI_add_slash(char *string) {
int len = strlen(string);
#ifdef WIN32
- if (string[len-1]!='\\') {
+ if (len==0 || string[len-1]!='\\') {
string[len] = '\\';
string[len+1] = '\0';
}
#else
- if (string[len-1]!='/') {
+ if (len==0 || string[len-1]!='/') {
string[len] = '/';
string[len+1] = '\0';
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2008-10-19
03:41:49 UTC (rev 17107)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2008-10-19
04:02:37 UTC (rev 17108)
@@ -7924,7 +7924,7 @@
bMessageActuator *msgAct =
(bMessageActuator *) act->data;
if (strlen(msgAct->toPropName) > 2) {
/* strip first 2 chars, would
have only worked if these were OB anyway */
- strncpy(msgAct->toPropName,
msgAct->toPropName+2, sizeof(msgAct->toPropName));
+ memmove( msgAct->toPropName,
msgAct->toPropName+2, sizeof(msgAct->toPropName)-2 );
} else {
msgAct->toPropName[0] = '\0';
}
Modified: trunk/blender/source/blender/src/editmesh.c
===================================================================
--- trunk/blender/source/blender/src/editmesh.c 2008-10-19 03:41:49 UTC (rev
17107)
+++ trunk/blender/source/blender/src/editmesh.c 2008-10-19 04:02:37 UTC (rev
17108)
@@ -633,6 +633,7 @@
if(em->retopo_paint_data) retopo_free_paint_data(em->retopo_paint_data);
em->retopo_paint_data= NULL;
+ em->act_face = NULL;
}
/* on G.editMesh */
Modified: trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
2008-10-19 03:41:49 UTC (rev 17107)
+++ trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
2008-10-19 04:02:37 UTC (rev 17108)
@@ -74,6 +74,7 @@
void SCA_JoystickSensor::Init()
{
m_istrig=(m_invert)?1:0;
+ m_istrig_prev=0;
m_reset = true;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
