Revision: 48306
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48306
Author: nazgul
Date: 2012-06-26 09:48:24 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Merging r48303 through r48305 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48303
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48305
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48302
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48305
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
2012-06-26 09:46:24 UTC (rev 48305)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
2012-06-26 09:48:24 UTC (rev 48306)
@@ -790,16 +790,15 @@
int ok_start = TRUE, ok_end = TRUE;
while (test_edge) {
- float v1[2], v2[2];
-
- sub_v2_v2v2(v1, edge->start, sites[i].co);
- sub_v2_v2v2(v2, edge->end, sites[i].co);
-
- if (ok_start && !testVoronoiEdge(sites[i].co,
edge->start, test_edge))
+ if (ok_start && !testVoronoiEdge(sites[i].co,
edge->start, test_edge)) {
ok_start = FALSE;
+ break;
+ }
- if (ok_end && !testVoronoiEdge(sites[i].co,
edge->end, test_edge))
+ if (ok_end && !testVoronoiEdge(sites[i].co,
edge->end, test_edge)) {
ok_end = FALSE;
+ break;
+ }
test_edge = test_edge->next;
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
2012-06-26 09:46:24 UTC (rev 48305)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
2012-06-26 09:48:24 UTC (rev 48306)
@@ -133,6 +133,7 @@
continue;
site = &sites[i];
+
pattern_ibuf = BKE_tracking_get_pattern_imbuf(ibuf, track,
marker, TRUE, FALSE);
zero_v3(site->color);
@@ -199,21 +200,66 @@
void *KeyingScreenOperation::initializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers)
{
+ TileData *tile_data;
+ TriangulationData *triangulation;
+ int triangles_allocated = 0;
+ int chunk_size = 20;
+ int i;
+ rctf rect_float;
+
if (this->m_movieClip == NULL)
return NULL;
- if (this->m_cachedTriangulation)
- return this->m_cachedTriangulation;
+ if (!this->m_cachedTriangulation) {
+ lockMutex();
+ if (this->m_cachedTriangulation == NULL) {
+ this->m_cachedTriangulation =
buildVoronoiTriangulation();
+ }
+ unlockMutex();
+ }
- lockMutex();
- if (this->m_cachedTriangulation == NULL) {
- this->m_cachedTriangulation = buildVoronoiTriangulation();
+ BLI_init_rctf(&rect_float, rect->xmin, rect->xmax, rect->ymin,
rect->ymax);
+
+ triangulation = this->m_cachedTriangulation;
+ tile_data = (TileData *) MEM_callocN(sizeof(TileData), "keying screen
tile data");
+
+ for (i = 0; i < triangulation->triangles_total; i++) {
+ bool ok = BLI_isect_rctf(&rect_float,
&triangulation->triangles_AABB[i], NULL);
+
+ if (ok) {
+ tile_data->triangles_total++;
+
+ if (tile_data->triangles_total > triangles_allocated) {
+ if (!tile_data->triangles) {
+ tile_data->triangles = (int *)
MEM_mallocN(sizeof(int) * chunk_size,
+
"keying screen tile triangles chunk");
+ }
+ else {
+ tile_data->triangles = (int *)
MEM_reallocN(tile_data->triangles,
+
sizeof(int) * (triangles_allocated + chunk_size));
+ }
+
+ triangles_allocated += chunk_size;
+ }
+
+ tile_data->triangles[tile_data->triangles_total - 1] =
i;
+ }
}
- unlockMutex();
- return this->m_cachedTriangulation;
+ return tile_data;
}
+void KeyingScreenOperation::deinitializeTileData(rcti *rect, MemoryBuffer
**memoryBuffers, void *data)
+{
+ TileData *tile_data = (TileData *) data;
+
+ if (tile_data->triangles) {
+ MEM_freeN(tile_data->triangles);
+ }
+
+ MEM_freeN(tile_data);
+}
+
void KeyingScreenOperation::determineResolution(unsigned int resolution[],
unsigned int preferredResolution[])
{
resolution[0] = 0;
@@ -240,15 +286,17 @@
color[3] = 1.0f;
if (this->m_movieClip && data) {
- TriangulationData *triangulation = (TriangulationData *) data;
+ TriangulationData *triangulation = this->m_cachedTriangulation;
+ TileData *tile_data = (TileData *) data;
int i;
float co[2] = {(float) x, (float) y};
- for (i = 0; i < triangulation->triangles_total; i++) {
- rctf *rect = &triangulation->triangles_AABB[i];
+ for (i = 0; i < tile_data->triangles_total; i++) {
+ int triangle_idx = tile_data->triangles[i];
+ rctf *rect =
&triangulation->triangles_AABB[triangle_idx];
if (IN_RANGE_INCL(x, rect->xmin, rect->xmax) &&
IN_RANGE_INCL(y, rect->ymin, rect->ymax)) {
- int *triangle = triangulation->triangles[i];
+ int *triangle =
triangulation->triangles[triangle_idx];
VoronoiTriangulationPoint *a =
&triangulation->triangulated_points[triangle[0]],
*b =
&triangulation->triangulated_points[triangle[1]],
*c =
&triangulation->triangulated_points[triangle[2]];
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.h
2012-06-26 09:46:24 UTC (rev 48305)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.h
2012-06-26 09:48:24 UTC (rev 48306)
@@ -50,6 +50,11 @@
rctf *triangles_AABB;
} TriangulationData;
+ typedef struct TileData {
+ int *triangles;
+ int triangles_total;
+ } TileData;
+
MovieClip *m_movieClip;
int m_framenumber;
TriangulationData *m_cachedTriangulation;
@@ -69,6 +74,7 @@
void deinitExecution();
void *initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers);
+ void deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers,
void *data);
void setMovieClip(MovieClip *clip) {this->m_movieClip = clip;}
void setTrackingObject(const char *object)
{strncpy(this->m_trackingObject, object, sizeof(this->m_trackingObject));}
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48302
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48305
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48302
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48305
Modified:
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
2012-06-26 09:46:24 UTC (rev 48305)
+++
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
2012-06-26 09:48:24 UTC (rev 48306)
@@ -2819,7 +2819,7 @@
short added = 0;
masklay_shape_new = masklay_shape->next;
- if (masklay_shape->flag & GP_FRAME_SELECT) {
+ if (masklay_shape->flag & MASK_SHAPE_SELECT) {
BLI_remlink(&masklay->splines_shapes,
masklay_shape);
/* find place to add them in buffer
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
