Merge branch 'master' into soc-2013-depsgraph_mtsoc-2013-depsgraph_mt

Conflicts:
	source/blender/blenkernel/intern/constraint.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/shrinkwrap.c
	source/blender/collada/AnimationExporter.cpp
	source/blender/editors/space_image/image_ops.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/makesrna/intern/rna_scene.c
	source/blender/modifiers/intern/MOD_util.c
	source/blender/render/intern/source/pipeline.c

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index 572b142d044..0ce40f717d4 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -582,7 +582,7 @@ void BLI_ascii_strtolower(char *str, const size_t len)
 {
 	size_t i;
 
-	for (i = 0; i < len; i++)
+	for (i = 0; (i < len) && str[i]; i++)
 		if (str[i] >= 'A' && str[i] <= 'Z')
 			str[i] += 'a' - 'A';
 }
@@ -591,7 +591,7 @@ void BLI_ascii_strtoupper(char *str, const size_t len)
 {
 	size_t i;
 
-	for (i = 0; i < len; i++)
+	for (i = 0; (i < len) && str[i]; i++)
 		if (str[i] >= 'a' && str[i] <= 'z')
 			str[i] -= 'a' - 'A';
 }