Commit: e70484d4f5e05971a0ba959d6437318b364deb79
Author: Brecht Van Lommel
Date: Wed Feb 26 12:36:10 2020 +0100
Branches: new-object-types
https://developer.blender.org/rBe70484d4f5e05971a0ba959d6437318b364deb79
Merge branch 'master' into new-object-types
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index 7a690a65b7d,4adce2d796c..d9b12d827f8
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -8842,89 -8781,6 +8842,89 @@@ static void direct_link_linestyle(FileD
/** \} */
+/* -------------------------------------------------------------------- */
+/** \name Read ID: Hair
+ * \{ */
+
+static void lib_link_hair(FileData *fd, Main *UNUSED(main), Hair *hair)
+{
+ for (int a = 0; a < hair->totcol; a++) {
- hair->mat[a] = newlibadr_us(fd, hair->id.lib, hair->mat[a]);
++ hair->mat[a] = newlibadr(fd, hair->id.lib, hair->mat[a]);
+ }
+}
+
+static void direct_link_hair(FileData *fd, Hair *hair)
+{
+ hair->adt = newdataadr(fd, hair->adt);
+ direct_link_animdata(fd, hair->adt);
+
+ /* Geometry */
+ direct_link_customdata(fd, &hair->pdata, hair->totpoint);
+ direct_link_customdata(fd, &hair->cdata, hair->totcurve);
+ BKE_hair_update_customdata_pointers(hair);
+
+ /* Materials */
+ hair->mat = newdataadr(fd, hair->mat);
+ test_pointer_array(fd, (void **)&hair->mat);
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Read ID: Point Cloud
+ * \{ */
+
+static void lib_link_pointcloud(FileData *fd, Main *UNUSED(main), PointCloud
*pointcloud)
+{
+ for (int a = 0; a < pointcloud->totcol; a++) {
- pointcloud->mat[a] = newlibadr_us(fd, pointcloud->id.lib,
pointcloud->mat[a]);
++ pointcloud->mat[a] = newlibadr(fd, pointcloud->id.lib,
pointcloud->mat[a]);
+ }
+}
+
+static void direct_link_pointcloud(FileData *fd, PointCloud *pointcloud)
+{
+ pointcloud->adt = newdataadr(fd, pointcloud->adt);
+ direct_link_animdata(fd, pointcloud->adt);
+
+ /* Geometry */
+ direct_link_customdata(fd, &pointcloud->pdata, pointcloud->totpoint);
+ BKE_pointcloud_update_customdata_pointers(pointcloud);
+
+ /* Materials */
+ pointcloud->mat = newdataadr(fd, pointcloud->mat);
+ test_pointer_array(fd, (void **)&pointcloud->mat);
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Read ID: Volume
+ * \{ */
+
+static void lib_link_volume(FileData *fd, Main *UNUSED(main), Volume *volume)
+{
+ for (int a = 0; a < volume->totcol; a++) {
- volume->mat[a] = newlibadr_us(fd, volume->id.lib, volume->mat[a]);
++ volume->mat[a] = newlibadr(fd, volume->id.lib, volume->mat[a]);
+ }
+}
+
+static void direct_link_volume(FileData *fd, Volume *volume)
+{
+ volume->adt = newdataadr(fd, volume->adt);
+ direct_link_animdata(fd, volume->adt);
+
+ volume->packedfile = direct_link_packedfile(fd, volume->packedfile);
+ volume->runtime.grids = (fd->volumemap) ? newvolumeadr(fd,
volume->runtime.grids) : NULL;
+ volume->runtime.frame = 0;
+ BKE_volume_init_grids(volume);
+
+ /* materials */
+ volume->mat = newdataadr(fd, volume->mat);
+ test_pointer_array(fd, (void **)&volume->mat);
+}
+
+/** \} */
+
/* -------------------------------------------------------------------- */
/** \name Read Library Data Block
* \{ */
diff --cc source/blender/editors/mesh/editmesh_knife_project.c
index edac5439df3,8d5c1469694..21de89d33dd
--- a/source/blender/editors/mesh/editmesh_knife_project.c
+++ b/source/blender/editors/mesh/editmesh_knife_project.c
@@@ -31,10 -31,8 +31,9 @@@
#include "BKE_mesh.h"
#include "BKE_context.h"
#include "BKE_curve.h"
- #include "BKE_cdderivedmesh.h"
#include "BKE_editmesh.h"
#include "BKE_mesh_runtime.h"
+#include "BKE_object.h"
#include "BKE_report.h"
#include "DEG_depsgraph.h"
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
