[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59389] branches/asset-browser/source/ blender/editors: === asset browser ===

[Andrea Weikert]

Revision: 59389
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59389
Author:   elubie
Date:     2013-08-22 18:32:52 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
=== asset browser ===

* Small fix: for now show at least the small icon in thumbnail view, so we can drag and drop
* Fix null pointer for empty asset collection

Modified Paths:
--------------
    branches/asset-browser/source/blender/editors/listview/listview_draw.c
    branches/asset-browser/source/blender/editors/space_asset/assetlist.c
    branches/asset-browser/source/blender/editors/space_asset/space_asset.c

Modified: branches/asset-browser/source/blender/editors/listview/listview_draw.c
===================================================================
--- branches/asset-browser/source/blender/editors/listview/listview_draw.c	2013-08-22 18:10:53 UTC (rev 59388)
+++ branches/asset-browser/source/blender/editors/listview/listview_draw.c	2013-08-22 18:32:52 UTC (rev 59389)
@@ -334,6 +334,7 @@
 
 		
 		if (FILE_IMGDISPLAY == layout->display) {
+			/* XXX_ELUBIE TODO: bring back large images */
 			is_icon = 0;
 			imb = contentlist_entry_get_image(cl, i);
 			if (!imb) {
@@ -341,7 +342,10 @@
 				is_icon = 1;
 			}
 			
-			listview_draw_preview(block, cl, i, sx, sy, imb, layout, !is_icon ); // XXXXX TODO: drop shadow was only for image files
+			/* XXX_ELUBIE TODO: draw real preview rather than icon */
+			/* listview_draw_preview(block, cl, i, sx, sy, imb, layout, !is_icon ); // XXXXX TODO: drop shadow was only for image files */
+			
+			listview_draw_icon(block, contentlist_entry_get_dragpath(cl,i), sx + layout->prv_w/2.0, sy, contentlist_entry_get_icon(cl, i), layout->prv_w, layout->prv_h);
 		}
 		else {
 			listview_draw_icon(block, contentlist_entry_get_dragpath(cl,i), sx, sy - (UI_UNIT_Y / 6), contentlist_entry_get_icon(cl, i), ICON_DEFAULT_WIDTH_SCALE, ICON_DEFAULT_HEIGHT_SCALE);

Modified: branches/asset-browser/source/blender/editors/space_asset/assetlist.c
===================================================================
--- branches/asset-browser/source/blender/editors/space_asset/assetlist.c	2013-08-22 18:10:53 UTC (rev 59388)
+++ branches/asset-browser/source/blender/editors/space_asset/assetlist.c	2013-08-22 18:32:52 UTC (rev 59389)
@@ -415,6 +415,7 @@
 	for (af = ac->asset_files.first; af; af= af->next) {
 		for (asset = af->assets.first; asset; asset = asset->next) {
 			cl->entries[current_entry].data = MEM_dupallocN(asset);
+			cl->entries[current_entry].image = NULL;
 			current_entry++;
 		}
 	}

Modified: branches/asset-browser/source/blender/editors/space_asset/space_asset.c
===================================================================
--- branches/asset-browser/source/blender/editors/space_asset/space_asset.c	2013-08-22 18:10:53 UTC (rev 59388)
+++ branches/asset-browser/source/blender/editors/space_asset/space_asset.c	2013-08-22 18:32:52 UTC (rev 59389)
@@ -134,8 +134,9 @@
 		cl = ar->regiondata = assetlist_new();
 	}
 
-	ac = BLI_findlink(&main->asset_collection, sasset->active_collection);
-	ac->changed = 1;
+	ac = BLI_findlink(&main->asset_collection, sasset->active_collection);	
+	if (ac) ac->changed = 1;
+
 	if (cl) {
 		if (ac) {
 			int do_update = asset_collection_update(main, ac) || contentlist_empty(cl);