* Merge trunk up to r39790.

* Subversion bump (also for init_userdef_do_versions). * Minor fix for compilation without ffmpeg.
2011-08-30 08:22:03 +00:00
parent 5b5e600db6 d049a722fe
commit 43ab8e8624
180 changed files with 6289 additions and 1990 deletions
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3138,7 +3138,7 @@ int object_is_modified(Scene *scene, Object *ob)
 	int flag= 0;

 	if(ob_get_key(ob)) {
-		flag |= eModifierMode_Render | eModifierMode_Render;
+		flag |= eModifierMode_Render;
 	}
 	else {
 		ModifierData *md;