[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41798] trunk/blender/source/blender: ensure that the path and directory are joined correctly for ocean cache ( assumed path ended with a '/')

[Campbell Barton]

Revision: 41798
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41798
Author:   campbellbarton
Date:     2011-11-13 15:17:24 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
ensure that the path and directory are joined correctly for ocean cache 
(assumed path ended with a '/')

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/CMakeLists.txt
    trunk/blender/source/blender/blenkernel/intern/ocean.c
    trunk/blender/source/blender/modifiers/intern/MOD_ocean.c

Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt      2011-11-13 
15:13:59 UTC (rev 41797)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt      2011-11-13 
15:17:24 UTC (rev 41798)
@@ -385,7 +385,9 @@
 endif()
 
 if(WITH_FFTW3)
-       list(APPEND INC_SYS ${FFTW3_INCLUDE_DIRS})      
+       list(APPEND INC_SYS
+               ${FFTW3_INCLUDE_DIRS}
+       )
        add_definitions(-DFFTW3=1)
 endif()
 

Modified: trunk/blender/source/blender/blenkernel/intern/ocean.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ocean.c      2011-11-13 
15:13:59 UTC (rev 41797)
+++ trunk/blender/source/blender/blenkernel/intern/ocean.c      2011-11-13 
15:17:24 UTC (rev 41798)
@@ -46,6 +46,7 @@
 #include "BLI_rand.h"
 #include "BLI_string.h"
 #include "BLI_threads.h"
+#include "BLI_path_util.h"
 #include "BLI_utildefines.h"
 
 #include "IMB_imbuf.h"
@@ -994,26 +995,27 @@
 #define CACHE_TYPE_FOAM                2
 #define CACHE_TYPE_NORMAL      3
 
-static void cache_filename(char *string, char *path, int frame, int type)
+static void cache_filename(char *string, const char *path, int frame, int type)
 {
-       char *cachepath=NULL;
+       char cachepath[FILE_MAX];
+       const char *fname;
        
        switch(type) {
                case CACHE_TYPE_FOAM:
-                       cachepath = BLI_strdupcat(path, "foam_");
+                       fname= "foam_";
                        break;
                case CACHE_TYPE_NORMAL:
-                       cachepath = BLI_strdupcat(path, "normal_");
+                       fname= "normal_";
                        break;
                case CACHE_TYPE_DISPLACE:
                default:
-                       cachepath = BLI_strdupcat(path, "disp_");
+                       fname= "disp_";
                        break;
        }               
-       
+
+       BLI_join_dirfile(cachepath, sizeof(cachepath), path, fname);
+
        BKE_makepicstring(string, cachepath, frame, R_OPENEXR, 1, TRUE);
-       
-       MEM_freeN(cachepath);
 }
 
 void BKE_free_ocean_cache(struct OceanCache *och)

Modified: trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_ocean.c   2011-11-13 
15:13:59 UTC (rev 41797)
+++ trunk/blender/source/blender/modifiers/intern/MOD_ocean.c   2011-11-13 
15:17:24 UTC (rev 41798)
@@ -122,9 +122,9 @@
        omd->size = 1.0;
        omd->repeat_x = 1;
        omd->repeat_y = 1;
-       
-       strcpy(omd->cachepath, "//ocean_cache/");
-       
+
+       BLI_strncpy(omd->cachepath, "//ocean_cache", sizeof(omd->cachepath));
+
        omd->cached = 0;
        omd->bakestart = 1;
        omd->bakeend = 250;

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