[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43657] trunk/blender/source/blender: commented smoke collision derived mesh,
Campbell Barton
ideasman42 at gmail.com
Tue Jan 24 02:21:52 CET 2012
Revision: 43657
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43657
Author: campbellbarton
Date: 2012-01-24 01:21:43 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
commented smoke collision derived mesh,
was storing its own copy of the collision mesh but never using it.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/makesdna/DNA_smoke_types.h
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-01-24 00:52:26 UTC (rev 43656)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-01-24 01:21:43 UTC (rev 43657)
@@ -77,6 +77,9 @@
#include "BKE_smoke.h"
+/* UNUSED so far, may be enabled later */
+/* #define USE_SMOKE_COLLISION_DM */
+
#ifdef WITH_SMOKE
#ifdef _WIN32
@@ -617,9 +620,11 @@
smd->coll->bvhtree = NULL;
}
+#ifdef USE_SMOKE_COLLISION_DM
if(smd->coll->dm)
smd->coll->dm->release(smd->coll->dm);
smd->coll->dm = NULL;
+#endif
MEM_freeN(smd->coll);
smd->coll = NULL;
@@ -682,9 +687,11 @@
smd->coll->bvhtree = NULL;
}
+#ifdef USE_SMOKE_COLLISION_DM
if(smd->coll->dm)
smd->coll->dm->release(smd->coll->dm);
smd->coll->dm = NULL;
+#endif
}
}
@@ -772,7 +779,10 @@
smd->coll->points = NULL;
smd->coll->numpoints = 0;
smd->coll->bvhtree = NULL;
+
+#ifdef USE_SMOKE_COLLISION_DM
smd->coll->dm = NULL;
+#endif
}
}
}
@@ -1339,11 +1349,13 @@
{
// XXX TODO
smd->time = scene->r.cfra;
-
+
+#ifdef USE_SMOKE_COLLISION_DM
if(smd->coll->dm)
smd->coll->dm->release(smd->coll->dm);
smd->coll->dm = CDDM_copy(dm);
+#endif
// rigid movement support
copy_m4_m4(smd->coll->mat_old, smd->coll->mat);
Modified: trunk/blender/source/blender/makesdna/DNA_smoke_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_smoke_types.h 2012-01-24 00:52:26 UTC (rev 43656)
+++ trunk/blender/source/blender/makesdna/DNA_smoke_types.h 2012-01-24 01:21:43 UTC (rev 43657)
@@ -138,7 +138,8 @@
typedef struct SmokeCollSettings {
struct SmokeModifierData *smd; /* for fast RNA access */
struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */
- struct DerivedMesh *dm;
+
+// struct DerivedMesh *dm; // UNUSED, ifdef'd in code for now.
float *points;
float *points_old;
float *vel;
More information about the Bf-blender-cvs
mailing list