Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 27 Jun 2016 13:59:01 +0000 (15:59 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 27 Jun 2016 13:59:01 +0000 (15:59 +0200)
Conflicts:
source/blender/blenkernel/intern/pointcache.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_particle.c

25 files changed:
1  2 
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_snap_object.c
source/blender/gpu/intern/gpu_draw.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

Simple merge
index cd379603901814f5529340adbdf04347182b174f,c0a0bc0b55a1c8a800af0a9897235d0005a540f9..c30414ab585b9916f4b6bdc47553d822f7fe6ee0
@@@ -643,19 -442,14 +440,6 @@@ static bAction *rna_Main_actions_new(Ma
        bAction *act = add_empty_action(bmain, name);
        id_fake_user_clear(&act->id);
        return act;
--}
- static void rna_Main_actions_remove(Main *bmain, ReportList *reports, PointerRNA *act_ptr)
 -
 -static ParticleSettings *rna_Main_particles_new(Main *bmain, const char *name)
--{
-       bAction *act = act_ptr->data;
-       if (ID_REAL_USERS(act) <= 0) {
-               BKE_libblock_free(bmain, act);
-               RNA_POINTER_INVALIDATE(act_ptr);
-       }
-       else {
-               BKE_reportf(reports, RPT_ERROR, "Action '%s' must have zero users to be removed, found %d",
-                           act->id.name + 2, ID_REAL_USERS(act));
-       }
 -      ParticleSettings *part = psys_new_settings(name, bmain);
 -      id_us_min(&part->id);
 -      return part;
--}
  
  static Palette *rna_Main_palettes_new(Main *bmain, const char *name)
  {
Simple merge