diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-03 22:54:02 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-03 22:54:02 -0300 |
| commit | f850f0d9eca0e0a93fe007daa598ccecad352475 (patch) | |
| tree | 1cb4bf17bd180cfbc617c88cfbf5166099357885 /scene | |
| parent | c631d597adca37bcd80a604e430fd9c5f0cc45bc (diff) | |
| parent | 62129469278b284b91845a678b517c04cefbebfe (diff) | |
Merge pull request #1784 from NateWardawg/sa_fixes
Fixed some items caught in cppcheck
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/3d/sprite_3d.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/animation.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 35f6523c6a..4952f742df 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -292,7 +292,7 @@ SpriteBase3D::SpriteBase3D() { parent_sprite=NULL; pI=NULL; - for(int i=0;i<4;i++) + for(int i=0;i<FLAG_MAX;i++) flags[i]=i==FLAG_TRANSPARENT; axis=Vector3::AXIS_Z; diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 0f11a66703..095406dad9 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1216,8 +1216,8 @@ T Animation::_interpolate( const Vector< TKey<T> >& p_keys, float p_time, Inter if (p_ok) *p_ok=true; - - int next; + + int next=0; float c=0; // prepare for all cases of interpolation |