Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-03-09 01:14:54 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-03-09 01:14:54 +0400
commit3a3c5db82be895c6302f96295320b1bc89608924 (patch)
tree0335754f5b02c6b6e15505ad340661b522bda92f /source
parent077deb14532c683e0a806aa42e891ee3213924d2 (diff)
- MSVC doesn't have log2f function
- Fix misusage of new [] and delete in BGE.
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c2
-rw-r--r--source/gameengine/VideoTexture/ImageViewport.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index ff2e6a4c0f1..e0334c9f762 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -418,7 +418,7 @@ static int rna_Scene_active_layer_get(PointerRNA *ptr)
{
Scene *scene = (Scene*)ptr->data;
- return (int)log2f(scene->layact);
+ return (int)(log(scene->layact)/M_LN2);
}
static void rna_Scene_view3d_update(Main *bmain, Scene *UNUSED(scene_unused), PointerRNA *ptr)
diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp
index 729b9ab9777..12f1fa0e20c 100644
--- a/source/gameengine/VideoTexture/ImageViewport.cpp
+++ b/source/gameengine/VideoTexture/ImageViewport.cpp
@@ -57,7 +57,7 @@ ImageViewport::ImageViewport (void) : m_alpha(false), m_texInit(false)
// destructor
ImageViewport::~ImageViewport (void)
-{ delete m_viewportImage; }
+{ delete [] m_viewportImage; }
// use whole viewport to capture image