[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45746] branches/smoke2: a) Merge trunk rev 45712 - 45744.
Daniel Genrich
daniel.genrich at gmx.net
Wed Apr 18 15:13:54 CEST 2012
Revision: 45746
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45746
Author: genscher
Date: 2012-04-18 13:13:54 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
a) Merge trunk rev 45712 - 45744.
b) Correct accitental commit of elbeem file.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45712
Modified Paths:
--------------
branches/smoke2/intern/elbeem/intern/solver_init.cpp
branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/mesh_validate.c
branches/smoke2/source/blender/blenlib/intern/scanfill.c
branches/smoke2/source/blender/blenloader/BLO_undofile.h
branches/smoke2/source/blender/blenloader/BLO_writefile.h
branches/smoke2/source/blender/blenloader/intern/undofile.c
branches/smoke2/source/blender/blenloader/intern/writefile.c
branches/smoke2/source/blender/bmesh/intern/bmesh_core.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mods.c
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.c
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.h
branches/smoke2/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/smoke2/source/blender/bmesh/operators/bmo_dissolve.c
branches/smoke2/source/blender/bmesh/operators/bmo_extrude.c
branches/smoke2/source/blender/bmesh/operators/bmo_triangulate.c
branches/smoke2/source/blender/bmesh/tools/BME_bevel.c
branches/smoke2/source/blender/editors/mesh/editmesh_knife.c
branches/smoke2/source/blender/editors/mesh/editmesh_rip.c
branches/smoke2/source/blender/editors/mesh/editmesh_select.c
branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
branches/smoke2/source/blender/editors/mesh/mesh_data.c
branches/smoke2/source/blender/editors/space_view3d/view3d_edit.c
branches/smoke2/source/blender/editors/space_view3d/view3d_fly.c
branches/smoke2/source/blender/editors/transform/transform.c
branches/smoke2/source/blender/editors/transform/transform_conversions.c
branches/smoke2/source/blender/editors/transform/transform_ops.c
branches/smoke2/source/blender/makesdna/DNA_windowmanager_types.h
branches/smoke2/source/blender/makesrna/intern/rna_wm.c
branches/smoke2/source/blender/makesrna/intern/rna_wm_api.c
branches/smoke2/source/blender/windowmanager/WM_keymap.h
branches/smoke2/source/blender/windowmanager/intern/wm_files.c
branches/smoke2/source/blender/windowmanager/intern/wm_keymap.c
branches/smoke2/source/blender/windowmanager/intern/wm_operators.c
branches/smoke2/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/smoke2/source/tools/uncrustify_clean.sh
Property Changed:
----------------
branches/smoke2/
branches/smoke2/release/scripts/templates/operator_file_import.py
Property changes on: branches/smoke2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:45664-45710
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:45664-45710,45712-45744
Modified: branches/smoke2/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/smoke2/intern/elbeem/intern/solver_init.cpp 2012-04-18 13:04:28 UTC (rev 45745)
+++ branches/smoke2/intern/elbeem/intern/solver_init.cpp 2012-04-18 13:13:54 UTC (rev 45746)
@@ -1407,13 +1407,10 @@
ntlGeometryObject *obj = (*mpGiObjects)[OId];
bool skip = false;
- int wasActive = ((obj->getGeoActive(sourceTime)>0.)? 1:0);
- int active = ((obj->getGeoActive(targetTime)>0.)? 1:0);
if(obj->getGeoInitId() != mLbmInitId) skip=true;
if( (!staticInit) && (!obj->getIsAnimated()) ) skip=true;
if( ( staticInit) && ( obj->getIsAnimated()) ) skip=true;
-
if(skip) continue;
debMsgStd("LbmFsgrSolver::initMovingObstacles",DM_MSG," obj "<<obj->getName()<<" skip:"<<skip<<", static:"<<staticInit<<" anim:"<<obj->getIsAnimated()<<" gid:"<<obj->getGeoInitId()<<" simgid:"<<mLbmInitId, 10);
@@ -1453,6 +1450,8 @@
otype = ntype = CFMbndOutflow;
break;
}
+ int wasActive = ((obj->getGeoActive(sourceTime)>0.)? 1:0);
+ int active = ((obj->getGeoActive(targetTime)>0.)? 1:0);
//errMsg("GEOACTT"," obj "<<obj->getName()<<" a:"<<active<<","<<wasActive<<" s"<<sourceTime<<" t"<<targetTime <<" v"<<mObjectSpeeds[OId] );
// skip inactive in/out flows
if(ntype==CFInvalid){ errMsg("LbmFsgrSolver::initMovingObstacles","Invalid obj type "<<obj->getGeoInitType()); continue; }
@@ -1866,10 +1865,7 @@
rhomass = 1.0;
ntype = CFFluid | CFMbndInflow;
} else {
- // ntype = CFInvalid;
-
- rhomass = 1.0;
- ntype = CFFluid;
+ ntype = CFInvalid;
}
break;
case FGI_MBNDOUTFLOW:
Property changes on: branches/smoke2/release/scripts/templates/operator_file_import.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-18 13:04:28 UTC (rev 45745)
+++ branches/smoke2/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-18 13:13:54 UTC (rev 45746)
@@ -1320,6 +1320,8 @@
ev = BM_vert_at_index(bmdm->tc->bm, index); /* warning, does list loop, _not_ ideal */
bmvert_to_mvert(bmdm->tc->bm, ev, vert_r);
+ if(bmdm->vertexCos)
+ copy_v3_v3(vert_r->co, bmdm->vertexCos[index]);
}
static void emDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r)
@@ -1378,13 +1380,18 @@
static void emDM_copyVertArray(DerivedMesh *dm, MVert *vert_r)
{
- BMesh *bm = ((EditDerivedBMesh *)dm)->tc->bm;
+ EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
+ BMesh *bm = bmdm->tc->bm;
BMVert *ev;
BMIter iter;
+ int i;
ev = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
- for ( ; ev; ev = BM_iter_step(&iter), ++vert_r) {
- copy_v3_v3(vert_r->co, ev->co);
+ for (i = 0 ; ev; ev = BM_iter_step(&iter), ++vert_r, ++i) {
+ if (bmdm->vertexCos)
+ copy_v3_v3(vert_r->co, bmdm->vertexCos[i]);
+ else
+ copy_v3_v3(vert_r->co, ev->co);
normal_float_to_short_v3(vert_r->no, ev->no);
Modified: branches/smoke2/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- branches/smoke2/source/blender/blenkernel/intern/mesh_validate.c 2012-04-18 13:04:28 UTC (rev 45745)
+++ branches/smoke2/source/blender/blenkernel/intern/mesh_validate.c 2012-04-18 13:13:54 UTC (rev 45746)
@@ -63,7 +63,7 @@
/* TODO check there is not some standard define of this somewhere! */
static int int_cmp(const void *v1, const void *v2)
{
- return *(int*)v1 > *(int*)v2 ? 1 : *(int*)v1 < *(int*)v2 ? -1 : 0;
+ return *(int *)v1 > *(int *)v2 ? 1 : *(int *)v1 < *(int *)v2 ? -1 : 0;
}
static int search_poly_cmp(const void *v1, const void *v2)
@@ -103,11 +103,11 @@
MDeformVert *dverts, /* assume totvert length */
const short do_verbose, const short do_fixes)
{
-# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; }
-# define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
+# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; }
+# define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
-# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; }
-# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; }
+# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; }
+# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; }
MVert *mv = mverts;
MEdge *me;
@@ -116,13 +116,13 @@
unsigned int i, j;
int *v;
- short do_edge_free= FALSE;
- short do_polyloop_free= FALSE; /* This regroups loops and polys! */
+ short do_edge_free = FALSE;
+ short do_polyloop_free = FALSE; /* This regroups loops and polys! */
- short verts_fixed= FALSE;
- short vert_weights_fixed= FALSE;
+ short verts_fixed = FALSE;
+ short vert_weights_fixed = FALSE;
- int do_edge_recalc= FALSE;
+ int do_edge_recalc = FALSE;
EdgeHash *edge_hash = BLI_edgehash_new();
@@ -136,53 +136,53 @@
do_edge_recalc = do_fixes;
}
- for (i=1; i<totvert; i++, mv++) {
+ for (i = 1; i < totvert; i++, mv++) {
int j;
- int fix_normal= TRUE;
+ int fix_normal = TRUE;
- for (j=0; j<3; j++) {
+ for (j = 0; j < 3; j++) {
if (!finite(mv->co[j])) {
PRINT(" vertex %u: has invalid coordinate\n", i);
if (do_fixes) {
zero_v3(mv->co);
- verts_fixed= TRUE;
+ verts_fixed = TRUE;
}
}
- if (mv->no[j]!=0)
- fix_normal= FALSE;
+ if (mv->no[j] != 0)
+ fix_normal = FALSE;
}
if (fix_normal) {
PRINT(" vertex %u: has zero normal, assuming Z-up normal\n", i);
if (do_fixes) {
- mv->no[2]= SHRT_MAX;
- verts_fixed= TRUE;
+ mv->no[2] = SHRT_MAX;
+ verts_fixed = TRUE;
}
}
}
- for (i=0, me= medges; i<totedge; i++, me++) {
- int remove= FALSE;
+ for (i = 0, me = medges; i < totedge; i++, me++) {
+ int remove = FALSE;
if (me->v1 == me->v2) {
PRINT(" edge %u: has matching verts, both %u\n", i, me->v1);
- remove= do_fixes;
+ remove = do_fixes;
}
if (me->v1 >= totvert) {
PRINT(" edge %u: v1 index out of range, %u\n", i, me->v1);
- remove= do_fixes;
+ remove = do_fixes;
}
if (me->v2 >= totvert) {
PRINT(" edge %u: v2 index out of range, %u\n", i, me->v2);
- remove= do_fixes;
+ remove = do_fixes;
}
if (BLI_edgehash_haskey(edge_hash, me->v1, me->v2)) {
PRINT(" edge %u: is a duplicate of %d\n", i,
GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, me->v1, me->v2)));
- remove= do_fixes;
+ remove = do_fixes;
}
if (remove == FALSE) {
@@ -281,7 +281,7 @@
int prev_e = ml->e;
ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, v1, v2));
PRINT(" poly %u has invalid edge reference (%u), fixed using edge %u\n",
- sp->index, prev_e, ml->e);
+ sp->index, prev_e, ml->e);
}
else {
PRINT(" poly %u has invalid edge reference (%u)\n", sp->index, ml->e);
@@ -471,24 +471,24 @@
/* fix deform verts */
if (dverts) {
MDeformVert *dv;
- for (i=0, dv= dverts; i<totvert; i++, dv++) {
+ for (i = 0, dv = dverts; i < totvert; i++, dv++) {
MDeformWeight *dw;
unsigned int j;
- for (j=0, dw= dv->dw; j < dv->totweight; j++, dw++) {
+ for (j = 0, dw = dv->dw; j < dv->totweight; j++, dw++) {
/* note, greater then max defgroups is accounted for in our code, but not < 0 */
if (!finite(dw->weight)) {
PRINT(" vertex deform %u, group %d has weight: %f\n", i, dw->def_nr, dw->weight);
if (do_fixes) {
- dw->weight= 0.0f;
- vert_weights_fixed= TRUE;
+ dw->weight = 0.0f;
+ vert_weights_fixed = TRUE;
}
}
else if (dw->weight < 0.0f || dw->weight > 1.0f) {
PRINT(" vertex deform %u, group %d has weight: %f\n", i, dw->def_nr, dw->weight);
if (do_fixes) {
CLAMP(dw->weight, 0.0f, 1.0f);
- vert_weights_fixed= TRUE;
+ vert_weights_fixed = TRUE;
}
}
@@ -500,9 +500,9 @@
/* re-allocated, the new values compensate for stepping
* within the for loop and may not be valid */
j--;
- dw= dv->dw + j;
+ dw = dv->dw + j;
- vert_weights_fixed= TRUE;
+ vert_weights_fixed = TRUE;
}
else { /* all freed */
break;
@@ -515,10 +515,10 @@
PRINT("BKE_mesh_validate: finished\n\n");
-# undef REMOVE_EDGE_TAG
-# undef IS_REMOVED_EDGE
-# undef REMOVE_LOOP_TAG
-# undef REMOVE_POLY_TAG
+# undef REMOVE_EDGE_TAG
+# undef IS_REMOVED_EDGE
+# undef REMOVE_LOOP_TAG
+# undef REMOVE_POLY_TAG
if (mesh) {
if (do_polyloop_free) {
@@ -539,20 +539,20 @@
static int mesh_validate_customdata(CustomData *data, short do_verbose, const short do_fixes)
{
- int i= 0, has_fixes= 0;
+ int i = 0, has_fixes = 0;
- while (i<data->totlayer) {
- CustomDataLayer *layer= &data->layers[i];
- CustomDataMask mask= CD_TYPE_AS_MASK(layer->type);
- int ok= 1;
+ while (i < data->totlayer) {
+ CustomDataLayer *layer = &data->layers[i];
+ CustomDataMask mask = CD_TYPE_AS_MASK(layer->type);
+ int ok = 1;
- if ((mask&CD_MASK_MESH)==0) {
+ if ((mask & CD_MASK_MESH) == 0) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list