[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59407] branches/soc-2013-depsgraph_mt: Merging r59402 through r59406 from trunk into soc-2013-depsgraph_mt

Sergey Sharybin sergey.vfx at gmail.com
Fri Aug 23 11:44:24 CEST 2013


Revision: 59407
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59407
Author:   nazgul
Date:     2013-08-23 09:44:24 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Merging r59402 through r59406 from trunk into soc-2013-depsgraph_mt

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

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_tracking.c

Property Changed:
----------------
    branches/soc-2013-depsgraph_mt/
    branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/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/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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59401
   + /branches/ge_dev:58091-58422
/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/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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59406

Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_mask_common.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_mask_common.py	2013-08-23 09:40:42 UTC (rev 59406)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_mask_common.py	2013-08-23 09:44:24 UTC (rev 59407)
@@ -31,10 +31,8 @@
         # assert(isinstance(item, bpy.types.MaskLayer)
         mask = item
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
-            split = layout.split()
-            split.label(text=mask.name, translate=False, icon_value=icon)
-            row = split.row(align=True)
-            row.prop(mask, "alpha", text="", emboss=False)
+            layout.label(text=mask.name, translate=False, icon_value=icon)
+            row = layout.row(align=True)
             row.prop(mask, "hide", text="", emboss=False)
             row.prop(mask, "hide_select", text="", emboss=False)
             row.prop(mask, "hide_render", text="", emboss=False)

Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_clip.py	2013-08-23 09:40:42 UTC (rev 59406)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_clip.py	2013-08-23 09:44:24 UTC (rev 59407)
@@ -316,6 +316,7 @@
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'TOOLS'
     bl_label = "Plane Track"
+    bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
         layout = self.layout
@@ -594,6 +595,7 @@
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Plane Track"
+    bl_options = {'DEFAULT_CLOSED'}
 
     def draw(self, context):
         layout = self.layout
@@ -718,7 +720,8 @@
 
         col.prop(sc, "show_disabled", "Disabled Tracks")
         col.prop(sc, "show_names", text="Names and Status")
-        col.prop(sc, "show_bundles", text="3D Markers")
+        if sc.mode != 'MASK':
+            col.prop(sc, "show_bundles", text="3D Markers")
 
         col.prop(sc, "use_mute_footage", text="Mute Footage")
         col.prop(sc, "lock_selection")


Property changes on: branches/soc-2013-depsgraph_mt/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/soc-2011-tomato/source/blender/editors/interface/interface.c: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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/trunk/blender/source/blender/editors/interface/interface.c:57395-59401
   + /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/soc-2011-tomato/source/blender/editors/interface/interface.c: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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/trunk/blender/source/blender/editors/interface/interface.c:57395-59406


Property changes on: branches/soc-2013-depsgraph_mt/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
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/trunk/blender/source/blender/editors/space_outliner:57395-59401
   + /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
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/trunk/blender/source/blender/editors/space_outliner:57395-59406

Modified: branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_tracking.c	2013-08-23 09:40:42 UTC (rev 59406)
+++ branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_tracking.c	2013-08-23 09:44:24 UTC (rev 59407)
@@ -229,23 +229,33 @@
 {
 	MovieClip *clip = (MovieClip *) ptr->id.data;
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingPlaneTrack *plane_track;
 	MovieTrackingPlaneMarker *plane_marker = (MovieTrackingPlaneMarker *) ptr->data;
+	MovieTrackingObject *tracking_object;
+	bool found = false;
+	MovieTrackingPlaneTrack *plane_track = NULL;
 
-	/* TODO(sergey): Need to support editing markers from object's tracks */
+	for (tracking_object = tracking->objects.first;
+	     tracking_object;
+	     tracking_object = tracking_object->next)
+	{
+		ListBase *tracksbase = BKE_tracking_object_get_plane_tracks(tracking, tracking_object);
 
-	plane_track = tracking->plane_tracks.first;
-	while (plane_track) {
-		if (plane_marker >= plane_track->markers &&
-		    plane_marker < plane_track->markers + plane_track->markersnr)
+		for (plane_track = tracksbase->first;
+			 plane_track;
+			 plane_track = plane_track->next)
 		{
+			if (plane_marker >= plane_track->markers && plane_marker < plane_track->markers + plane_track->markersnr) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found) {
 			break;
 		}
-
-		plane_track = plane_track->next;
 	}
 
-	if (plane_track) {
+	if (found) {
 		MovieTrackingPlaneMarker new_plane_marker = *plane_marker;
 		new_plane_marker.framenr = value;
 
@@ -455,19 +465,33 @@
 {
 	MovieClip *clip = (MovieClip *) ptr->id.data;
 	MovieTracking *tracking = &clip->tracking;
-	MovieTrackingTrack *track;
 	MovieTrackingMarker *marker = (MovieTrackingMarker *) ptr->data;
+	MovieTrackingObject *tracking_object;
+	bool found = false;
+	MovieTrackingTrack *track = NULL;
 
-	track = tracking->tracks.first;
-	while (track) {
-		if (marker >= track->markers && marker < track->markers + track->markersnr) {
+	for (tracking_object = tracking->objects.first;
+	     tracking_object;
+	     tracking_object = tracking_object->next)
+	{
+		ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
+
+		for (track = tracksbase->first;
+			 track;
+			 track = track->next)
+		{

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list