[Bf-blender-cvs] [26658af] asset-engine: Amber: fix missing '..' parent dir entry when inside a repo.

Bastien Montagne noreply at git.blender.org
Mon May 2 20:51:34 CEST 2016


Commit: 26658afad1a26bf20ea77f417f86e9eec59cd66a
Author: Bastien Montagne
Date:   Mon May 2 20:50:57 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB26658afad1a26bf20ea77f417f86e9eec59cd66a

Amber: fix missing '..' parent dir entry when inside a repo.

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

M	release/scripts/startup/bl_operators/amber.py
M	source/blender/editors/space_file/filelist.c

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

diff --git a/release/scripts/startup/bl_operators/amber.py b/release/scripts/startup/bl_operators/amber.py
index a60f726..e9945c0 100644
--- a/release/scripts/startup/bl_operators/amber.py
+++ b/release/scripts/startup/bl_operators/amber.py
@@ -278,7 +278,7 @@ class AmberTag(PropertyGroup):
 
 class AssetEngineAmber(AssetEngine):
     bl_label = "Amber"
-    bl_version = (0 << 16) + (0 << 8) + 3  # Usual maj.min.rev version scheme...
+    bl_version = (0 << 16) + (0 << 8) + 4  # Usual maj.min.rev version scheme...
 
     tags = CollectionProperty(name="Tags", type=AmberTag, description="Filtering tags")
     active_tag_index = IntProperty(name="Active Tag", options={'HIDDEN'})
@@ -588,7 +588,7 @@ class AssetEngineAmber(AssetEngine):
                         continue
                     self.sortedfiltered.append((path, size, timestamp, uuid))
             use_sort = True
-        entries.nbr_entries_filtered = len(self.sortedfiltered)
+        entries.nbr_entries_filtered = len(self.sortedfiltered) + (1 if self.repo else 0)
 
         if use_sort:
             if self.repo:
@@ -613,6 +613,17 @@ class AssetEngineAmber(AssetEngine):
     def entries_block_get(self, start_index, end_index, entries):
 #        print(entries.entries[:])
         if self.repo:
+            if start_index == 0:
+                entry = entries.entries.add()
+                entry.type = {'DIR'}
+                entry.relpath = '..'
+                variant = entry.variants.add()
+                entry.variants.active = variant
+                rev = variant.revisions.add()
+                variant.revisions.active = rev
+            else:
+                start_index -= 1
+            end_index -= 1
             #~ print("self repo", len(self.sortedfiltered), start_index, end_index)
             for euuid, e in self.sortedfiltered[start_index:end_index]:
                 self.entry_from_uuid(entries, euuid, (0, 0, 0, 0), (0, 0, 0, 0))
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index b065ed2..26762cd 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -727,7 +727,7 @@ void filelist_sort_filter(struct FileList *filelist, FileSelectParams *params)
 			const bool need_filtering = filelist_need_filtering(filelist);
 			const bool changed = filelist->ae->type->sort_filter(
 			                         filelist->ae, need_sorting, need_filtering, params, &filelist->filelist);
-			printf("%s: changed: %d (%d - %d)\n", __func__, changed, need_sorting, need_filtering);
+//			printf("%s: changed: %d (%d - %d)\n", __func__, changed, need_sorting, need_filtering);
 			if (changed) {
 				filelist_cache_clear(&filelist->filelist_cache, filelist->filelist_cache.size);
 			}




More information about the Bf-blender-cvs mailing list