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
diff options
context:
space:
mode:
-rw-r--r--intern/SoundSystem/intern/SND_Utils.cpp4
-rw-r--r--release/scripts/c3d_import.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp
index 1593dd6c794..78115807970 100644
--- a/intern/SoundSystem/intern/SND_Utils.cpp
+++ b/intern/SoundSystem/intern/SND_Utils.cpp
@@ -309,7 +309,7 @@ unsigned int SND_GetNumberOfSamples(void* sample, int sample_length)
{
offset += block_align;
- if (offset+4 > sample_length) /* save us from crashing */
+ if (offset+block_align > sample_length) /* save us from crashing */
return 0;
}
offset += 4;
@@ -347,7 +347,7 @@ unsigned int SND_GetHeaderSize(void* sample, int sample_length)
{
offset += block_align;
- if (offset+4 > sample_length) /* save us from crashing */
+ if (offset+block_align > sample_length) /* save us from crashing */
return 0;
}
headersize = offset + 8;
diff --git a/release/scripts/c3d_import.py b/release/scripts/c3d_import.py
index ca4f8cd79e9..bfe691c394c 100644
--- a/release/scripts/c3d_import.py
+++ b/release/scripts/c3d_import.py
@@ -1,5 +1,5 @@
#!BPY
-
+# -*- coding: latin-1 -*-
"""
Name: 'Motion Capture (.c3d)...'
Blender: 246