[Bf-blender-cvs] [0548a1d] id-remap: Merge branch 'free-refcount-ids' into id-remap

Bastien Montagne noreply at git.blender.org
Mon Oct 5 12:38:55 CEST 2015


Commit: 0548a1dc6f101071de7872071def5d47b0a3ceee
Author: Bastien Montagne
Date:   Mon Oct 5 12:32:00 2015 +0200
Branches: id-remap
https://developer.blender.org/rB0548a1dc6f101071de7872071def5d47b0a3ceee

Merge branch 'free-refcount-ids' into id-remap

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



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

diff --cc source/blender/blenkernel/BKE_curve.h
index 3105b9a,17836ce..4ac5629
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@@ -66,10 -66,8 +66,9 @@@ typedef struct CurveCache 
  #define CU_DO_2DFILL(cu)  ((((cu)->flag & CU_3D) == 0) && (((cu)->flag & (CU_FRONT | CU_BACK)) != 0))
  
  /* ** Curve ** */
- void BKE_curve_release_datablocks(struct Curve *cu);
  void BKE_curve_free(struct Curve *cu, const bool do_id_user);
  void BKE_curve_editfont_free(struct Curve *cu);
 +void BKE_curve_init(struct Curve *cu);
  struct Curve *BKE_curve_add(struct Main *bmain, const char *name, int type);
  struct Curve *BKE_curve_copy(struct Curve *cu);
  void BKE_curve_make_local(struct Curve *cu);
diff --cc source/blender/blenkernel/BKE_lattice.h
index 3e7db65,adf37c6..d4fa9af
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@@ -45,10 -45,8 +45,9 @@@ struct BPoint
  struct MDeformVert;
  
  void BKE_lattice_resize(struct Lattice *lt, int u, int v, int w, struct Object *ltOb);
 +void BKE_lattice_init(struct Lattice *lt);
  struct Lattice *BKE_lattice_add(struct Main *bmain, const char *name);
  struct Lattice *BKE_lattice_copy(struct Lattice *lt);
- void BKE_lattice_release_datablocks(struct Lattice *lt);
  void BKE_lattice_free(struct Lattice *lt, const bool do_id_user);
  void BKE_lattice_make_local(struct Lattice *lt);
  void calc_lat_fudu(int flag, int res, float *r_fu, float *r_du);
diff --cc source/blender/blenkernel/BKE_linestyle.h
index c3fc00f,8d6a860..76e64d4
--- a/source/blender/blenkernel/BKE_linestyle.h
+++ b/source/blender/blenkernel/BKE_linestyle.h
@@@ -49,9 -49,7 +49,8 @@@ struct Object
  struct ColorBand;
  struct bContext;
  
 +void BKE_linestyle_init(struct FreestyleLineStyle *linestyle);
  FreestyleLineStyle *BKE_linestyle_new(struct Main *bmain, const char *name);
- void                BKE_linestyle_release_datablocks(FreestyleLineStyle *linestyle);
  void                BKE_linestyle_free(FreestyleLineStyle *linestyle, const bool do_id_user);
  FreestyleLineStyle *BKE_linestyle_copy(struct Main *bmain, FreestyleLineStyle *linestyle);
  
diff --cc source/blender/blenkernel/BKE_mball.h
index e7dfb45,02c5328..b09d815
--- a/source/blender/blenkernel/BKE_mball.h
+++ b/source/blender/blenkernel/BKE_mball.h
@@@ -38,9 -38,7 +38,8 @@@ struct Object
  struct Scene;
  struct MetaElem;
  
- void BKE_mball_release_datablocks(struct MetaBall *mb);
  void BKE_mball_free(struct MetaBall *mb, const bool do_id_user);
 +void BKE_mball_init(struct MetaBall *mb);
  struct MetaBall *BKE_mball_add(struct Main *bmain, const char *name);
  struct MetaBall *BKE_mball_copy(struct MetaBall *mb);
  
diff --cc source/blender/blenkernel/BKE_mesh.h
index 754fcf1,805c562..0674aaa
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@@ -80,9 -80,7 +80,8 @@@ int poly_get_adj_loops_from_vert
  
  int BKE_mesh_edge_other_vert(const struct MEdge *e, int v);
  
- void BKE_mesh_release_datablocks(struct Mesh *me);
  void BKE_mesh_free(struct Mesh *me, const bool do_id_user);
 +void BKE_mesh_init(struct Mesh *me);
  struct Mesh *BKE_mesh_add(struct Main *bmain, const char *name);
  struct Mesh *BKE_mesh_copy_ex(struct Main *bmain, struct Mesh *me);
  struct Mesh *BKE_mesh_copy(struct Mesh *me);
diff --cc source/blender/blenkernel/BKE_scene.h
index ebe993b,a18c1e7..14c7ace
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@@ -66,9 -66,7 +66,8 @@@ struct Base *_setlooper_base_step(struc
  void free_avicodecdata(struct AviCodecData *acd);
  void free_qtcodecdata(struct QuicktimeCodecData *acd);
  
- void BKE_scene_release_datablocks(struct Scene *sce);
  void BKE_scene_free(struct Scene *sce, const bool do_id_user);
 +void BKE_scene_init(struct Scene *sce);
  struct Scene *BKE_scene_add(struct Main *bmain, const char *name);
  
  /* base functions */
diff --cc source/blender/blenkernel/BKE_world.h
index 32d8960,a77a5b0..7d3c56f
--- a/source/blender/blenkernel/BKE_world.h
+++ b/source/blender/blenkernel/BKE_world.h
@@@ -36,9 -36,7 +36,8 @@@
  struct Main;
  struct World;
  
- void BKE_world_release_datablocks(struct World *wrld);
  void BKE_world_free(struct World *sc, const bool do_id_user);
 +void BKE_world_init(struct World *wrld);
  struct World *add_world(struct Main *bmian, const char *name);
  struct World *BKE_world_copy(struct World *wrld);
  struct World *localize_world(struct World *wrld);
diff --cc source/blender/blenkernel/intern/material.c
index 30fb694,300485c..4cff6d4
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@@ -138,14 -127,12 +127,14 @@@ void BKE_material_free(Material *ma, co
  
  	GPU_material_free(&ma->gpumaterial);
  
- 	BKE_previewimg_free(&ma->preview);
  	BKE_icon_id_delete((ID *)ma);
+ 	BKE_previewimg_free(&ma->preview);
  }
  
 -void init_material(Material *ma)
 +void BKE_init_material(Material *ma)
  {
 +	BLI_assert(MEMCMP_NULL_STRUCT_OFS(ma, id));
 +
  	ma->r = ma->g = ma->b = ma->ref = 0.8;
  	ma->specr = ma->specg = ma->specb = 1.0;
  	ma->mirr = ma->mirg = ma->mirb = 1.0;
diff --cc source/blender/blenkernel/intern/world.c
index d07cfdb,95fa067..239835d
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@@ -100,14 -89,16 +89,14 @@@ void BKE_world_free(World *wrld, const 
  
  	GPU_material_free(&wrld->gpumaterial);
  	
- 	BKE_previewimg_free(&wrld->preview);
  	BKE_icon_id_delete((struct ID *)wrld);
+ 	BKE_previewimg_free(&wrld->preview);
  }
  
 -World *add_world(Main *bmain, const char *name)
 +void BKE_world_init(World *wrld)
  {
 -	World *wrld;
 +	BLI_assert(MEMCMP_NULL_STRUCT_OFS(wrld, id));
  
 -	wrld = BKE_libblock_alloc(bmain, ID_WO, name);
 -	
  	wrld->horr = 0.05f;
  	wrld->horg = 0.05f;
  	wrld->horb = 0.05f;




More information about the Bf-blender-cvs mailing list