Commit: cbce7fef1604fdfd3099fd196b2a44f61b22eb76
Author: Bastien Montagne
Date: Mon Jun 27 15:59:01 2016 +0200
Branches: blender2.8
https://developer.blender.org/rBcbce7fef1604fdfd3099fd196b2a44f61b22eb76
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/pointcache.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_particle.c
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_main_api.c
index cd37960,c0a0bc0..c30414a
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@@ -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)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
