[Bf-blender-cvs] [66a00b64c5c] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Sun Jul 29 04:13:00 CEST 2018


Commit: 66a00b64c5cc64e28289147fdfbcf5bf8f046c34
Author: Campbell Barton
Date:   Sun Jul 29 12:12:36 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB66a00b64c5cc64e28289147fdfbcf5bf8f046c34

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_file/file_panels.c
index cf8a5b9e1f2,a40334098d7..cbf685e6ed8
--- a/source/blender/editors/space_file/file_panels.c
+++ b/source/blender/editors/space_file/file_panels.c
@@@ -80,7 -80,7 +80,7 @@@ static void file_panel_operator(const b
  	UI_block_func_set(uiLayoutGetBlock(pa->layout), file_draw_check_cb, NULL, NULL);
  
  	/* Hack: temporary hide.*/
- 	const char *hide[4] = {"filepath", "files", "directory", "filename"};
 -	const char *hide[] = {"filepath", "directory", "filename", "files"};
++	const char *hide[] = {"filepath", "files", "directory", "filename"};
  	for (int i = 0; i < ARRAY_SIZE(hide); i++) {
  		PropertyRNA *prop = RNA_struct_find_property(op->ptr, hide[i]);
  		if (prop) {



More information about the Bf-blender-cvs mailing list