[Bf-blender-cvs] [9e4229e] master: OSX/fsmenu: fix compiling on older gcc reported by Mike S

Jens Verwiebe noreply at git.blender.org
Mon Nov 3 15:07:04 CET 2014


Commit: 9e4229e0adc54c4218a192ee73ba415ddfccc706
Author: Jens Verwiebe
Date:   Mon Nov 3 15:05:48 2014 +0100
Branches: master
https://developer.blender.org/rB9e4229e0adc54c4218a192ee73ba415ddfccc706

OSX/fsmenu: fix compiling on older gcc reported by Mike S

===================================================================

M	source/blender/editors/space_file/fsmenu.c
M	source/blender/editors/space_file/fsmenu.h

===================================================================

diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index c117b8c..f046ac7 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -447,7 +447,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
 				/* Exclude "all my files" as it makes no sense in blender fileselector */
 				/* Exclude "airdrop" if wlan not active as it would show "" ) */
 				if (!strstr(line, "myDocuments.cannedSearch") && (*line != '\0')) {
-					fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL);
+					fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, FS_APPEND_LAST);
 				}
 				
 				CFRelease(pathString);
diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h
index 01bd4e9..f66bfce 100644
--- a/source/blender/editors/space_file/fsmenu.h
+++ b/source/blender/editors/space_file/fsmenu.h
@@ -47,7 +47,8 @@ typedef enum FSMenuCategory {
 typedef enum FSMenuInsert {
 	FS_INSERT_SORTED = (1 << 0),
 	FS_INSERT_SAVE   = (1 << 1),
-	FS_INSERT_FIRST  = (1 << 2)   /* moves the item to the front of the list when its not already there */
+	FS_INSERT_FIRST  = (1 << 2),   /* moves the item to the front of the list when its not already there */
+	FS_APPEND_LAST  = (1 << 3)   /*just append to preseve delivered order */
 } FSMenuInsert;
 
 struct FSMenu;




More information about the Bf-blender-cvs mailing list