[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40902] trunk/blender/source/blender/ windowmanager/intern/wm_operators.c: Now append/ link will start at current blend file directory, if available ( lastest used lib keeps priority).

[Bastien Montagne]

Revision: 40902
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40902
Author:   mont29
Date:     2011-10-10 08:25:28 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Now append/link will start at current blend file directory, if available 
(lastest used lib keeps priority).

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c    
2011-10-10 07:55:06 UTC (rev 40901)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c    
2011-10-10 08:25:28 UTC (rev 40902)
@@ -1626,7 +1626,15 @@
        } 
        else {
                /* XXX TODO solve where to get last linked library from */
-               RNA_string_set(op->ptr, "filepath", G.lib);
+               if(G.lib[0] != '\0') {
+                       RNA_string_set(op->ptr, "filepath", G.lib);
+               }
+               else if(G.relbase_valid) {
+                       char path[FILE_MAX];
+                       BLI_strncpy(path, G.main->name, sizeof(G.main->name));
+                       BLI_parent_dir(path);
+                       RNA_string_set(op->ptr, "filepath", path);
+               }
                WM_event_add_fileselect(C, op);
                return OPERATOR_RUNNING_MODAL;
        }

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