[Bf-blender-cvs] [7592e5d] gooseberry: Disable collapse images option after operator ends.

[Antony Riakiotakis]

Commit: 7592e5dbf592d65fc65665d07b6c0ae86a87d956
Author: Antony Riakiotakis
Date:   Fri Jun 5 11:26:25 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB7592e5dbf592d65fc65665d07b6c0ae86a87d956

Disable collapse images option after operator ends.

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

M	source/blender/editors/space_file/file_ops.c

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

diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index dbda561..656ce60 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -917,7 +917,10 @@ void file_sfile_to_operator(wmOperator *op, SpaceFile *sfile, char *filepath)
 			}
 		}
 
-
+		if ((prop = RNA_struct_find_property(op->ptr, "collapse_images"))) {
+			/* turn off collapsed flag if evoked from operator */
+			sfile->params->flag &= ~FILE_COLLAPSE_IMAGES;
+		}
 	}
 }