[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52089] trunk/blender/source/gameengine: BGE: fix for 2 uses of uninitialized memory - property-sensor and object-color for materials .
Campbell Barton
ideasman42 at gmail.com
Sun Nov 11 11:03:27 CET 2012
Revision: 52089
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52089
Author: campbellbarton
Date: 2012-11-11 10:03:25 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
BGE: fix for 2 uses of uninitialized memory - property-sensor and object-color for materials.
Modified Paths:
--------------
trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
Modified: trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp 2012-11-11 09:07:29 UTC (rev 52088)
+++ trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp 2012-11-11 10:03:25 UTC (rev 52089)
@@ -152,13 +152,11 @@
*/
if (result==false && dynamic_cast<CFloatValue *>(orgprop) != NULL) {
float f;
-
- if (EOF == sscanf(m_checkpropval.ReadPtr(), "%f", &f))
- {
- //error
+ if (sscanf(m_checkpropval.ReadPtr(), "%f", &f) == 1) {
+ result = (f == ((CFloatValue *)orgprop)->GetFloat());
}
else {
- result = (f == ((CFloatValue *)orgprop)->GetFloat());
+ /* error */
}
}
/* end patch */
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2012-11-11 09:07:29 UTC (rev 52088)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2012-11-11 10:03:25 UTC (rev 52089)
@@ -99,6 +99,7 @@
m_bSuspendDynamics(false),
m_bUseObjectColor(false),
m_bIsNegativeScaling(false),
+ m_objectColor(1.0, 1.0, 1.0, 1.0),
m_bVisible(true),
m_bCulled(true),
m_bOccluder(false),
More information about the Bf-blender-cvs
mailing list