soc-2008-mxcurioni: merged changes to revision 15163
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 8 Jun 2008 20:12:29 +0000 (20:12 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 8 Jun 2008 20:12:29 +0000 (20:12 +0000)
26 files changed:
1  2 
config/linux2-config.py
config/win32-vc-config.py
extern/SConscript
release/scripts/uvcalc_lightmap.py
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/psfont.c
source/blender/blenlib/intern/util.c
source/blender/blenloader/intern/readfile.c
source/blender/imbuf/SConscript
source/blender/makesdna/DNA_scene_types.h
source/blender/python/BPY_interface.c
source/blender/python/api2_2x/Node.c
source/blender/python/api2_2x/sceneRender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/src/buttons_object.c
source/blender/src/buttons_scene.c
source/blender/src/drawipo.c
source/blender/src/drawobject.c
source/blender/src/drawseq.c
source/blender/src/editseq.c
source/blender/src/filesel.c
source/blender/src/space.c
tools/btools.py

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -874,11 -873,16 +871,18 @@@ void BLI_cleanup_file(const char *relab
  {
        short a;
        char *start, *eind;
 +
        if (relabase) {
                BLI_convertstringcode(dir, relabase);
+       } else {
+               if (dir[0]=='/' && dir[1]=='/') {
+                       if (dir[2]== '\0') {
+                               return; /* path is "//" - cant clean it */
+                       }
+                       dir = dir+2; /* skip the first // */
+               }
        }
 +
  #ifdef WIN32
        if(dir[0]=='.') {       /* happens for example in FILE_MAIN */
           get_default_root(dir);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/btools.py
Simple merge