[Bf-blender-cvs] [9b0f0f7f1f3] asset-engine: Merge branch 'id_override_static' into asset-engine

[Bastien Montagne]

Commit: 9b0f0f7f1f3220578dfa0072975cdd0ff54fbeeb
Author: Bastien Montagne
Date:   Tue Oct 3 12:40:34 2017 +0200
Branches: asset-engine
https://developer.blender.org/rB9b0f0f7f1f3220578dfa0072975cdd0ff54fbeeb

Merge branch 'id_override_static' into asset-engine

Conflicts:
	source/blender/editors/sculpt_paint/paint_vertex.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 0e4a2da7106,e1a4137d069..11dcf377bb2
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1681,33 -1682,21 +1682,47 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "VPaint", "char", "falloff_shape")) {
+ 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 				ToolSettings *ts = scene->toolsettings;
+ 				for (int i = 0; i < 2; i++) {
+ 					VPaint *vp = i ? ts->vpaint : ts->wpaint;
+ 					if (vp != NULL) {
+ 						/* remove all other flags */
+ 						vp->flag &= (VP_FLAG_VGROUP_RESTRICT);
+ 						vp->normal_angle = 80;
+ 					}
+ 				}
+ 			}
+ 		}
  	}
 +
 +	{
 +		/* Move non-op filebrowsers to 'library browsing' type/mode. */
 +		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
 +			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 +				for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 +					if (sl->spacetype == SPACE_FILE) {
 +						SpaceFile *sfile = (SpaceFile *)sl;
 +						if (sfile->params != NULL) {
 +							sfile->params->type = FILE_LOADLIB;
 +							sfile->params->filter = FILE_TYPE_FOLDER | FILE_TYPE_BLENDERLIB;
 +							/* For now, always init filterid to 'all true' */
 +							sfile->params->filter_id = FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR | FILTER_ID_CA |
 +							                           FILTER_ID_CU | FILTER_ID_GD | FILTER_ID_GR | FILTER_ID_IM |
 +							                           FILTER_ID_LA | FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA |
 +							                           FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME | FILTER_ID_MSK |
 +							                           FILTER_ID_NT | FILTER_ID_OB | FILTER_ID_PA | FILTER_ID_PAL |
 +							                           FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
 +							                           FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO |
 +							                           FILTER_ID_CF;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
  
  void do_versions_after_linking_270(Main *main)