[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38789] branches/soc-2011-pepper/source/ blender/blenloader/intern/readfile.c: Patching error in last commit.

[Joerg Mueller]

Revision: 38789
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38789
Author:   nexyon
Date:     2011-07-28 14:18:07 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
Patching error in last commit.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c        
2011-07-28 13:58:59 UTC (rev 38788)
+++ branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c        
2011-07-28 14:18:07 UTC (rev 38789)
@@ -11507,21 +11507,6 @@
                                        kb->slidermax = kb->slidermin + 1.0f;
                        }
                }
-
-               {
-                       Scene *scene;
-                       Sequence *seq;
-
-                       for (scene=main->scene.first; scene; 
scene=scene->id.next)
-                       {
-                               scene->r.ffcodecdata.audio_channels = 2;
-                               scene->audio.volume = 1.0f;
-                               SEQ_BEGIN(scene->ed, seq) {
-                                       seq->pitch = 1.0f;
-                               }
-                               SEQ_END
-                       }
-               }
        }
        
        if (main->versionfile < 256 || (main->versionfile == 256 && 
main->subversionfile < 1)) {
@@ -11759,7 +11744,21 @@
        /* put compatibility code here until next subversion bump */
 
        {
-       
+
+               {
+                       Scene *scene;
+                       Sequence *seq;
+
+                       for (scene=main->scene.first; scene; 
scene=scene->id.next)
+                       {
+                               scene->r.ffcodecdata.audio_channels = 2;
+                               scene->audio.volume = 1.0f;
+                               SEQ_BEGIN(scene->ed, seq) {
+                                       seq->pitch = 1.0f;
+                               }
+                               SEQ_END
+                       }
+               }
        }
        
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! 
*/

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs