diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
commit | 78a4e2461419f026d53e409cb75073ba5f47e1bb (patch) | |
tree | 2847f536bee9b51a0d30f59baf6becc22a8acffd /source/blender/blenkernel | |
parent | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (diff) | |
parent | bac6757ea0b1c873b8dd8221592ea95eed8d5bac (diff) |
svn merge ^/trunk/blender -r43009:43033
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 15 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 10 |
4 files changed, 15 insertions, 18 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 8f03f29706f..744e0e56ab6 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -179,9 +179,9 @@ typedef struct IndexNode { struct IndexNode *next, *prev; int index; } IndexNode; -void create_vert_face_map(ListBase **map, IndexNode **mem, const struct MFace *mface, +void create_vert_face_map(struct ListBase **map, IndexNode **mem, const struct MFace *mface, const int totvert, const int totface); -void create_vert_edge_map(ListBase **map, IndexNode **mem, const struct MEdge *medge, +void create_vert_edge_map(struct ListBase **map, IndexNode **mem, const struct MEdge *medge, const int totvert, const int totedge); /* functions for making menu's from customdata layers */ diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index e56a8034b21..3cb2f8ce738 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2564,7 +2564,9 @@ static void dag_id_flush_update(Scene *sce, ID *id) bConstraint *con; for (con = obt->constraints.first; con; con=con->next) { bConstraintTypeInfo *cti= constraint_get_typeinfo(con); - if(ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER)) { + if(ELEM3(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER, + CONSTRAINT_TYPE_OBJECTSOLVER)) + { obt->recalc |= OB_RECALC_OB; break; } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 0c5d5f238ff..294b4e4bde4 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -510,8 +510,6 @@ static void scene_setSubframe(Scene *scene, float subframe) scene->r.subframe = subframe; } -#define BRUSH_USES_VELOCITY (1<<0) - static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene) { Base *base = NULL; @@ -2285,7 +2283,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) tPoint->quad = (isInside == 2) ? 1 : 0; /* quad or tri part*/ /* save vertex indexes */ - tPoint->v1 = mface[i].v1; /* (isInside == 2) ? mface[i].v1 : mface[i].v1; */ /* same! */ + tPoint->v1 = mface[i].v1; tPoint->v2 = (isInside == 2) ? mface[i].v3 : mface[i].v2; tPoint->v3 = (isInside == 2) ? mface[i].v4 : mface[i].v3; @@ -2365,7 +2363,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) tPoint->quad = tempPoints[ind].quad; // quad or tri /* save vertex indexes */ - tPoint->v1 = (tPoint->quad) ? mface[i].v1 : mface[i].v1; + tPoint->v1 = mface[i].v1; tPoint->v2 = (tPoint->quad) ? mface[i].v3 : mface[i].v2; tPoint->v3 = (tPoint->quad) ? mface[i].v4 : mface[i].v3; @@ -2395,10 +2393,8 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) } } - /* If any effect enabled, create surface effect / wet layer - * neighbour lists. Processes possibly moving data. */ - if (surface_usesAdjData(surface)) { - + /* Generate surface adjacency data. */ + { int i, cursor=0; /* Create a temporary array of final indexes (before unassigned @@ -2411,12 +2407,11 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) } /* allocate memory */ sData->total_points = w*h; - dynamicPaint_initAdjacencyData(surface, 0); + dynamicPaint_initAdjacencyData(surface, 1); if (sData->adj_data) { PaintAdjData *ed = sData->adj_data; unsigned int n_pos = 0; - //#pragma omp parallel for schedule(static) for (ty = 0; ty < h; ty++) { int tx; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 6eeae07cb1b..7bfc7a8ef87 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1258,8 +1258,7 @@ int BKE_tracking_next(MovieTrackingContext *context) double x1, y1, x2, y2; ImBuf *ibuf= NULL; MovieTrackingMarker marker_new, *marker_keyed; - int onbound= 0, coords_correct= 0; - int nextfra; + int onbound= 0, nextfra; if(track->pattern_match==TRACK_MATCH_KEYFRAME) need_readjust= context->first_time; @@ -1377,8 +1376,7 @@ int BKE_tracking_next(MovieTrackingContext *context) MEM_freeN(image_new); } - coords_correct= !onbound && !isnan(x2) && !isnan(y2) && finite(x2) && finite(y2); - if(coords_correct && !onbound && tracked) { + if(tracked && !onbound && finite(x2) && finite(y2)) { if(context->first_time) { #pragma omp critical { @@ -1682,7 +1680,8 @@ int BKE_tracking_can_reconstruct(MovieTracking *tracking, MovieTrackingObject *o return 1; #else BLI_strncpy(error_msg, "Blender is compiled without motion tracking library", error_size); - (void) tracking; + (void)tracking; + (void)object; return 0; #endif @@ -2274,6 +2273,7 @@ void BKE_tracking_detect_fast(MovieTracking *tracking, ListBase *tracksbase, ImB libmv_destroyFeatures(features); #else (void)tracking; + (void)tracksbase; (void)ibuf; (void)framenr; (void)margin; |