diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-11 14:03:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-11 14:03:25 +0400 |
| commit | 47068e88fba5b8a79ae8a9a09dadac684869faa6 (patch) | |
| tree | 3b805ab87ac51af42a02d02cd6fcbe918ce9c740 /source/gameengine | |
| parent | f5df1601d6c6d03377f30f3787b964cab71ec3e0 (diff) | |
BGE: fix for 2 uses of uninitialized memory - property-sensor and object-color for materials.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/GameLogic/SCA_PropertySensor.cpp | 8 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp index ced3b8418fe..f02ac495233 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp +++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp @@ -152,13 +152,11 @@ bool SCA_PropertySensor::CheckPropertyCondition() */ 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 */ diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index a669f4346ea..4f3d020a3d9 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -99,6 +99,7 @@ KX_GameObject::KX_GameObject( 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), |