Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 25 Jul 2016 13:07:17 +0000 (15:07 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 25 Jul 2016 13:07:17 +0000 (15:07 +0200)
Conflicts:
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/particle.c

41 files changed:
1  2 
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/blender/blender_util.h
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_texture.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/texture.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap_object.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/renderdatabase.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

Simple merge
Simple merge
Simple merge
index 9b9b80a2ecc3002464c2a77e09d9a66882e23697,c31df6851368121ddd7dbc2deca65747a744de4c..6718f1a13ce81faf570ec42d9e1bbac4a8e7db59
  #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:
Simple merge