Commit: baca92ce0ab774458ada34d082f3f2b52523c21f
Author: Sybren A. Stüvel
Date: Tue Apr 24 10:02:17 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rBbaca92ce0ab774458ada34d082f3f2b52523c21f
Some debugging going on here
===================================================================
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/modifiers/intern/MOD_simpledeform.c
===================================================================
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index 33540c8746b..fd323fe02de 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1070,6 +1070,9 @@ void CDDM_apply_vert_coords(DerivedMesh *dm, float
(*vertCoords)[3])
MVert *vert;
int i;
+ printf("CDDM_apply_vert_coords(cddm=%p, cddm.mvert=%p, vertcoords=%p,
coord[0]=(%.3f, %.3f))\n",
+ cddm, cddm->mvert, vertCoords, vertCoords[0][0],
vertCoords[0][1]);
+
/* this will just return the pointer if it wasn't a referenced layer */
vert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT,
dm->numVertData);
cddm->mvert = vert;
diff --git a/source/blender/blenkernel/intern/modifier.c
b/source/blender/blenkernel/intern/modifier.c
index f610ac70c65..d467db49c9a 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1102,12 +1102,23 @@ struct DerivedMesh
*modifier_applyModifier_DM_deprecated(struct ModifierData *md
struct Mesh *mesh = ob->data;
BLI_assert(DEG_depsgraph_use_copy_on_write());
BLI_assert(mesh->id.tag & LIB_TAG_COPY_ON_WRITE); /* This
should be a CoW mesh */
+ BLI_assert(BLI_findindex(&G.main->mesh, mesh) == -1); /* This
should be a CoW mesh */
+
if (dm != NULL) {
+// Mesh mesh_l = {0};
+// BKE_mesh_init(&mesh_l);
+// DM_to_mesh(dm, &mesh_l, ob, CD_MASK_EVERYTHING, false);
// BKE_mesh_free(mesh);
- mesh = MEM_callocN(sizeof(struct Mesh), "Mesh");
+// *mesh = mesh_l;
+
+ // BKE_mesh_free(mesh);
// MEMSET_STRUCT_OFS(mesh, 0, id);
- BKE_mesh_init(mesh);
- printf("Converting DM_to_mesh(dm=%p, mesh=%s=%p)\n",
dm, mesh->id.name, mesh);
+// mesh = MEM_callocN(sizeof(struct Mesh), "temp mesh");
+// BKE_mesh_init(mesh);
+ Mesh *orig = (Mesh *)mesh->id.orig_id;
+ printf("Converting DM_to_mesh(dm=%p, mesh=%s=%p
orig=%p vptr=%p orig=%p)\n",
+ dm, mesh->id.name, mesh,
+ orig, mesh->mvert, orig->mvert);
DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
}
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c
b/source/blender/modifiers/intern/MOD_simpledeform.c
index 959b4608554..f59bb9f0744 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -32,6 +32,7 @@
* \ingroup modifiers
*/
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
@@ -185,6 +186,7 @@ static void
SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object
float (*vertexCos)[3], int numVerts)
{
const float base_limit[2] = {0.0f, 0.0f};
+ printf("SimpleDeformModifier_do(ob=%p, me=%p, me.mverts=%p, vcos=%p\n",
ob, mesh, mesh->mvert, vertexCos);
int i;
float smd_limit[2], smd_factor;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
