[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43896] branches/bmesh/blender/source/ blender/blenkernel/intern: sync changes from trunk.
Campbell Barton
ideasman42 at gmail.com
Sun Feb 5 08:44:41 CET 2012
Revision: 43896
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43896
Author: campbellbarton
Date: 2012-02-05 07:44:40 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
sync changes from trunk.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2012-02-05 07:40:15 UTC (rev 43895)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2012-02-05 07:44:40 UTC (rev 43896)
@@ -945,6 +945,7 @@
else dvert = NULL;
} else
dvert = NULL;
+
if(armature_def_nr >= 0 && dvert) {
armature_weight= defvert_find_weight(dvert, armature_def_nr);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/particle.c 2012-02-05 07:40:15 UTC (rev 43895)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/particle.c 2012-02-05 07:44:40 UTC (rev 43896)
@@ -55,7 +55,6 @@
#include "BLI_threads.h"
#include "BLI_linklist.h"
#include "BLI_bpath.h"
-#include "BLI_math.h"
#include "BKE_anim.h"
#include "BKE_animsys.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c 2012-02-05 07:40:15 UTC (rev 43895)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c 2012-02-05 07:44:40 UTC (rev 43896)
@@ -2302,7 +2302,7 @@
if(timescale) {
time= BKE_curframe(scene);
- nexttime= BKE_frame_to_ctime(scene, CFRA + 1.0f);
+ nexttime= BKE_frame_to_ctime(scene, CFRA+1);
*timescale= MAX2(nexttime - time, 0.0f);
}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c 2012-02-05 07:40:15 UTC (rev 43895)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c 2012-02-05 07:44:40 UTC (rev 43896)
@@ -588,9 +588,7 @@
}
//free memory
- if(ss_mesh) {
- ss_mesh->needsFree = 1;
+ if(ss_mesh)
ss_mesh->release(ss_mesh);
- }
}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-05 07:40:15 UTC (rev 43895)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-05 07:44:40 UTC (rev 43896)
@@ -494,7 +494,7 @@
MEM_freeN(wtable->weight_table);
}
-static int ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm,
+static void ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm,
float (*vertexCos)[3], int useFlatSubdiv)
{
float creaseFactor = (float) ccgSubSurf_getSubdivisionLevels(ss);
@@ -567,22 +567,21 @@
static int hasGivenError = 0;
if(!hasGivenError) {
- printf("Unrecoverable error in SubSurf calculation,"
- " mesh is inconsistent.\n");
+ //XXX error("Unrecoverable error in SubSurf calculation,"
+ // " mesh is inconsistent.");
hasGivenError = 1;
}
- return 0;
+ return;
}
- ((int*)ccgSubSurf_getFaceUserData(ss, f))[1] = index ? *index++: i;
+ ((int*)ccgSubSurf_getFaceUserData(ss, f))[1] = (index)? *index++: i;
}
ccgSubSurf_processSync(ss);
BLI_array_free(fVerts);
- return 1;
}
/***/
@@ -1103,11 +1102,6 @@
edgeSize, gridSize);
mf->v4 = getFaceIndex(ss, f, S, x + 1, y + 0,
edgeSize, gridSize);
- if (faceFlags) {
- mat_nr = faceFlags[index*2+1];
- mf->flag = faceFlags[index*2];
- } else mf->flag = flag;
-
mf->mat_nr = mat_nr;
mf->flag = flag;
@@ -1209,11 +1203,6 @@
for(x = 0; x < gridSize - 1; x++) {
MPoly *mf = &mface[i];
- if (faceFlags) {
- mat_nr = faceFlags[index*2+1];
- mf->flag = faceFlags[index*2];
- } else mf->flag = flag;
-
mf->mat_nr = mat_nr;
mf->flag = flag;
mf->loopstart = k;
@@ -3304,7 +3293,7 @@
result->freeSS = 1;
} else {
- int useIncremental = 1; //(smd->flags & eSubsurfModifierFlag_Incremental);
+ int useIncremental = (smd->flags & eSubsurfModifierFlag_Incremental);
int levels= (smd->modifier.scene)? get_render_subsurf_level(&smd->modifier.scene->r, smd->levels): smd->levels;
CCGSubSurf *ss;
@@ -3327,13 +3316,7 @@
if(useIncremental && isFinalCalc) {
smd->mCache = ss = _getSubSurf(smd->mCache, levels, useAging|CCG_CALC_NORMALS);
- if (!ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple)) {
- //ccgSubSurf_free(smd->mCache);
- smd->mCache = ss = _getSubSurf(NULL, levels, useAging);
-
- ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple);
-
- }
+ ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple);
result = getCCGDerivedMesh(smd->mCache,
drawInteriorEdges,
More information about the Bf-blender-cvs
mailing list