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

[Bastien Montagne]

Commit: b1532493c27b08444745cef348641f3a0e899ba8
Author: Bastien Montagne
Date:   Mon Jul 25 15:07:17 2016 +0200
Branches: blender2.8
https://developer.blender.org/rBb1532493c27b08444745cef348641f3a0e899ba8

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/particle.c

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 9b9b80a,c31df68..6718f1a
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -104,7 -105,9 +105,8 @@@
  #include "BKE_mask.h"
  #include "BKE_node.h"
  #include "BKE_object.h"
 -#include "BKE_particle.h"
  #include "BKE_packedFile.h"
+ #include "BKE_sound.h"
  #include "BKE_speaker.h"
  #include "BKE_scene.h"
  #include "BKE_text.h"
@@@ -323,25 -373,34 +372,31 @@@ bool id_make_local(Main *bmain, ID *id
  		case ID_SCR:
  			return false; /* can't be linked */
  		case ID_VF:
- 			return false; /* not implemented */
+ 			/* Partially implemented (has no copy...). */
+ 			if (!test) BKE_vfont_make_local(bmain, (VFont *)id, lib_local);
+ 			return true;
  		case ID_TXT:
- 			return false; /* not implemented */
+ 			if (!test) BKE_text_make_local(bmain, (Text *)id, lib_local);
+ 			return true;
  		case ID_SO:
- 			return false; /* not implemented */
+ 			/* Partially implemented (has no copy...). */
+ 			if (!test) BKE_sound_make_local(bmain, (bSound *)id, lib_local);
+ 			return true;
  		case ID_GR:
- 			return false; /* not implemented */
+ 			if (!test) BKE_group_make_local(bmain, (Group *)id, lib_local);
+ 			return true;
  		case ID_AR:
- 			if (!test) BKE_armature_make_local(bmain, (bArmature *)id, force_local);
+ 			if (!test) BKE_armature_make_local(bmain, (bArmature *)id, lib_local);
  			return true;
  		case ID_AC:
- 			if (!test) BKE_action_make_local(bmain, (bAction *)id, force_local);
+ 			if (!test) BKE_action_make_local(bmain, (bAction *)id, lib_local);
  			return true;
  		case ID_NT:
- 			if (!test) ntreeMakeLocal(bmain, (bNodeTree *)id, true, force_local);
+ 			if (!test) ntreeMakeLocal(bmain, (bNodeTree *)id, true, lib_local);
  			return true;
  		case ID_BR:
- 			if (!test) BKE_brush_make_local(bmain, (Brush *)id, force_local);
+ 			if (!test) BKE_brush_make_local(bmain, (Brush *)id, lib_local);
  			return true;
 -		case ID_PA:
 -			if (!test) BKE_particlesettings_make_local(bmain, (ParticleSettings *)id, lib_local);
 -			return true;
  		case ID_WM:
  			return false; /* can't be linked */
  		case ID_GD: