[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22210] branches/soc-2008-mxcurioni/source /blender: Fixed compiler errors (tested with VC++ 2009 Express Edition, CMake 2.6.3).

[Tamito Kajiyama]

Revision: 22210
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22210
Author:   kjym3
Date:     2009-08-04 11:48:54 +0200 (Tue, 04 Aug 2009)

Log Message:
-----------
Fixed compiler errors (tested with VC++ 2009 Express Edition, CMake 2.6.3).

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt        
2009-08-04 09:20:48 UTC (rev 22209)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt        
2009-08-04 09:48:54 UTC (rev 22210)
@@ -32,7 +32,7 @@
   ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
   ../../../intern/iksolver/extern ../blenloader ../quicktime
   ../../../intern/bmfont ../../../extern/bullet2/src
-  ../nodes ../../../extern/glew/include ../gpu
+  ../nodes ../../../extern/glew/include ../gpu ../freestyle
   ${SDL_INC}
   ${ZLIB_INC}
   ${PYTHON_INC}

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c        
2009-08-04 09:20:48 UTC (rev 22209)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c        
2009-08-04 09:48:54 UTC (rev 22210)
@@ -131,6 +131,7 @@
 void free_scene(Scene *sce)
 {
        Base *base;
+       SceneRenderLayer *srl;
 
        base= sce->base.first;
        while(base) {
@@ -164,7 +165,6 @@
                sce->r.ffcodecdata.properties = NULL;
        }
        
-       SceneRenderLayer *srl;
        for(srl= sce->r.layers.first; srl; srl= srl->next) {
                BLI_freelistN( &srl->freestyleConfig.modules);
        }

Modified: 
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c     
2009-08-04 09:20:48 UTC (rev 22209)
+++ branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c     
2009-08-04 09:48:54 UTC (rev 22210)
@@ -3523,6 +3523,7 @@
        Sequence *seq;
        MetaStack *ms;
        int a;
+       SceneRenderLayer *srl;
 
        sce->theDag = NULL;
        sce->dagisvalid = 0;
@@ -3682,7 +3683,6 @@
        link_list(fd, &(sce->transform_spaces));
        link_list(fd, &(sce->r.layers));
        
-       SceneRenderLayer *srl;
        for(srl= sce->r.layers.first; srl; srl= srl->next) {
                link_list(fd, &(srl->freestyleConfig.modules));
        }


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