[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47227] branches/soc-2011-tomato: Merging r47215 through r47226 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 47227
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47227
Author:   nazgul
Date:     2012-05-30 14:33:24 +0000 (Wed, 30 May 2012)
Log Message:
-----------
Merging r47215 through r47226 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47215
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47226

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp

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-47214
   + /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-47226

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c	2012-05-30 14:30:28 UTC (rev 47226)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c	2012-05-30 14:33:24 UTC (rev 47227)
@@ -383,6 +383,9 @@
 			nearest->dist = dist;
 			copy_v3_v3(nearest->co, nearest_tmp);
 			normal_tri_v3(nearest->no, t0, t1, t2);
+
+			if (t1 == vert[face->v3].co)
+				nearest->flags |= BVH_ONQUAD;
 		}
 
 		t1 = t2;
@@ -420,6 +423,9 @@
 			madd_v3_v3v3fl(hit->co, ray->origin, ray->direction, dist);
 
 			normal_tri_v3(hit->no, t0, t1, t2);
+
+			if (t1 == vert[face->v3].co)
+				hit->flags |= BVH_ONQUAD;
 		}
 
 		t1 = t2;

Modified: branches/soc-2011-tomato/source/blender/blenlib/BLI_kdopbvh.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/BLI_kdopbvh.h	2012-05-30 14:30:28 UTC (rev 47226)
+++ branches/soc-2011-tomato/source/blender/blenlib/BLI_kdopbvh.h	2012-05-30 14:33:24 UTC (rev 47227)
@@ -49,11 +49,15 @@
 	int indexB;
 } BVHTreeOverlap;
 
+/* flags */
+#define BVH_ONQUAD (1<<0)
+
 typedef struct BVHTreeNearest {
 	int index;          /* the index of the nearest found (untouched if none is found within a dist radius from the given coordinates) */
 	float co[3];        /* nearest coordinates (untouched it none is found within a dist radius from the given coordinates) */
 	float no[3];        /* normal at nearest coordinates (untouched it none is found within a dist radius from the given coordinates) */
 	float dist;         /* squared distance to search arround */
+	int flags;
 } BVHTreeNearest;
 
 typedef struct BVHTreeRay {
@@ -67,6 +71,7 @@
 	float co[3];        /* coordinates of the hit point */
 	float no[3];        /* normal on hit point */
 	float dist;         /* distance to the hit point */
+	int flags;
 } BVHTreeRayHit;
 
 /* callback must update nearest in case it finds a nearest result */

Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp	2012-05-30 14:30:28 UTC (rev 47226)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp	2012-05-30 14:33:24 UTC (rev 47227)
@@ -68,6 +68,10 @@
 				MEM_freeN(rr->rectf);
 			}
 			rr->rectf = outputBuffer;
+		} else {
+			if (this->outputBuffer) {
+				MEM_freeN(this->outputBuffer);
+			}
 		}
 		if (re) {
 			RE_ReleaseResult(re);


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-47214
   + /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-47226


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-47214
   + /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-47226