[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47947] branches/smoke2/source/blender: - Fix crash on blend file loading
Daniel Genrich
daniel.genrich at gmx.net
Fri Jun 15 13:44:24 CEST 2012
Revision: 47947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47947
Author: genscher
Date: 2012-06-15 11:44:23 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
- Fix crash on blend file loading
- Change bvh tree to 3 axes (should be faster for raytracing)
- Remove unused variables from DNA/code: ob_mat
Modified Paths:
--------------
branches/smoke2/source/blender/blenkernel/intern/smoke.c
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/makesdna/DNA_smoke_types.h
Modified: branches/smoke2/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/smoke2/source/blender/blenkernel/intern/smoke.c 2012-06-15 11:42:09 UTC (rev 47946)
+++ branches/smoke2/source/blender/blenkernel/intern/smoke.c 2012-06-15 11:44:23 UTC (rev 47947)
@@ -280,23 +280,13 @@
}
else if((smd->type & MOD_SMOKE_TYPE_COLL))
{
- // todo: delete this when loading colls work -dg
- SmokeCollSettings *scs;
-
if(!smd->coll)
{
smokeModifier_createType(smd);
}
- // init collision points
- scs = smd->coll;
-
smd->time = scene->r.cfra;
- // copy obmat
- copy_m4_m4(scs->mat, ob->obmat);
- copy_m4_m4(scs->mat_old, ob->obmat);
-
return 1;
}
@@ -703,7 +693,7 @@
}
}
- if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 8)) {
+ if (bvhtree_from_mesh_faces(&treeData, dm, 0.0f, 4, 6)) {
#pragma omp parallel for schedule(static)
for (z = 0; z < res[2]; z++) {
int x,y;
Modified: branches/smoke2/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/smoke2/source/blender/blenloader/intern/readfile.c 2012-06-15 11:42:09 UTC (rev 47946)
+++ branches/smoke2/source/blender/blenloader/intern/readfile.c 2012-06-15 11:44:23 UTC (rev 47947)
@@ -4387,6 +4387,7 @@
if (smd->coll) {
smd->coll->verts_old = NULL;
smd->coll->numverts = 0;
+ smd->coll->dm = NULL;
}
else
smd->type = 0;
Modified: branches/smoke2/source/blender/makesdna/DNA_smoke_types.h
===================================================================
--- branches/smoke2/source/blender/makesdna/DNA_smoke_types.h 2012-06-15 11:42:09 UTC (rev 47946)
+++ branches/smoke2/source/blender/makesdna/DNA_smoke_types.h 2012-06-15 11:44:23 UTC (rev 47947)
@@ -131,18 +131,11 @@
int flags; /* absolute emission etc*/
} SmokeFlowSettings;
-
-// struct BVHTreeFromMesh *bvh;
-// float mat[4][4];
-// float mat_old[4][4];
-
/* collision objects (filled with smoke) */
typedef struct SmokeCollSettings {
struct SmokeModifierData *smd; /* for fast RNA access */
struct DerivedMesh *dm;
float *verts_old;
- float mat[4][4];
- float mat_old[4][4];
int numverts;
short type; // static = 0, rigid = 1, dynamic = 2
short pad;
More information about the Bf-blender-cvs
mailing list