diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-04 13:48:54 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-04 13:48:54 +0400 |
| commit | 8503ae90067c910049728cdf8c7818fc270f1c00 (patch) | |
| tree | 13141957687c65849af9d0ee3436ca56961e4840 | |
| parent | f436f5bb4650a3a27d7e5d75263660f4b321505f (diff) | |
Fixed compiler errors (tested with VC++ 2009 Express Edition, CMake 2.6.3).
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 0ed4f38e457..cf8c06d5d4d 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -32,7 +32,7 @@ SET(INC ../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} diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ffb3a7f5e4a..40808c77a10 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -131,6 +131,7 @@ void free_qtcodecdata(QuicktimeCodecData *qcd) void free_scene(Scene *sce) { Base *base; + SceneRenderLayer *srl; base= sce->base.first; while(base) { @@ -164,7 +165,6 @@ void free_scene(Scene *sce) sce->r.ffcodecdata.properties = NULL; } - SceneRenderLayer *srl; for(srl= sce->r.layers.first; srl; srl= srl->next) { BLI_freelistN( &srl->freestyleConfig.modules); } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f656f791f5d..a9f317368c9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3523,6 +3523,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) Sequence *seq; MetaStack *ms; int a; + SceneRenderLayer *srl; sce->theDag = NULL; sce->dagisvalid = 0; @@ -3682,7 +3683,6 @@ static void direct_link_scene(FileData *fd, Scene *sce) 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)); } |