[Bf-blender-cvs] [edb87ec] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: edb87ecd75d6302af5f28bf43823e2915bd02e69
Author: Bastien Montagne
Date:   Tue Jun 16 14:24:05 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBedb87ecd75d6302af5f28bf43823e2915bd02e69

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/editors/space_file/file_ops.c

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



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

diff --cc source/blender/editors/space_file/file_ops.c
index 279d600,8c9233e..b9de2e0
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -487,21 -480,20 +487,21 @@@ static bool file_walk_select_selection_
  
  	if (has_selection) {
  		if (extend &&
 -		    filelist_is_selected(files, active_old, FILE_SEL_SELECTED) &&
 -		    filelist_is_selected(files, active_new, FILE_SEL_SELECTED))
 +		    filelist_entry_select_index_get(files, active_old, FILE_SEL_SELECTED) &&
 +		    filelist_entry_select_index_get(files, active_new, FILE_SEL_SELECTED))
  		{
- 				/* conditions for deselecting: initial file is selected, new file is
- 				 * selected and either other_side isn't selected/found or we use fill */
+ 			/* conditions for deselecting: initial file is selected, new file is
+ 			 * selected and either other_side isn't selected/found or we use fill */
 -			deselect = (fill || other_site == -1 || !filelist_is_selected(files, other_site, FILE_SEL_SELECTED));
 +				deselect = (fill || other_site == -1 ||
 +				            !filelist_entry_select_index_get(files, other_site, FILE_SEL_SELECTED));
  
- 				/* don't change active here since we either want to deselect active or we want to
- 				 * walk through a block of selected files without selecting/deselecting anything */
- 				params->active_file = active_new;
- 				/* but we want to change active if we use fill (needed to get correct selection bounds) */
- 				if (deselect && fill) {
- 					active = active_new;
- 				}
+ 			/* don't change active here since we either want to deselect active or we want to
+ 			 * walk through a block of selected files without selecting/deselecting anything */
+ 			params->active_file = active_new;
+ 			/* but we want to change active if we use fill (needed to get correct selection bounds) */
+ 			if (deselect && fill) {
+ 				active = active_new;
+ 			}
  		}
  		else {
  			/* regular selection change */