[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38854] branches/soc-2011-salad: Merging r38834 through r38853 soc-2011-tomato into soc-2011-salad

[Sergey Sharybin]

Revision: 38854
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38854
Author:   nazgul
Date:     2011-07-30 14:24:28 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Merging r38834 through r38853 soc-2011-tomato into soc-2011-salad

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

Modified Paths:
--------------
    branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38846
/branches/soc-2011-tomato:36831-38833
/trunk/blender:36834-38846
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38846
/branches/soc-2011-tomato:36831-38853
/trunk/blender:36834-38846

Modified: branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c	2011-07-30 14:22:15 UTC (rev 38853)
+++ branches/soc-2011-salad/source/blender/editors/transform/transform_conversions.c	2011-07-30 14:24:28 UTC (rev 38854)
@@ -5367,28 +5367,26 @@
 		if(TRACK_SELECTED(track) && (track->flag&TRACK_LOCKED)==0) {
 			marker= BKE_tracking_get_marker(track, framenr);
 
-			if(marker) {
-				trackToTransData(sc, td, td2d, tdt, track);
+			trackToTransData(sc, td, td2d, tdt, track);
 
-				td++;
-				td2d++;
-				tdt++;
+			td++;
+			td2d++;
+			tdt++;
 
-				if((marker->flag&MARKER_DISABLED)==0) {
-					if(track->flag&SELECT) {td++; td2d++; tdt+=2;}
-					if(track->pat_flag&SELECT) {td+= 2; td2d+= 2;tdt+=2;}
-				}
+			if((marker->flag&MARKER_DISABLED)==0) {
+				if(track->flag&SELECT) {td++; td2d++; tdt++;}
+				if(track->pat_flag&SELECT) {td+= 2; td2d+= 2;tdt+=2;}
+			}
 
-				if(track->search_flag&SELECT) {
-					td+= 2;
-					td2d+= 2;
-					tdt+= 2;
+			if(track->search_flag&SELECT) {
+				td+= 2;
+				td2d+= 2;
+				tdt+= 2;
 
-					if(marker->flag&MARKER_DISABLED) {
-						td+= 3;
-						td2d+= 3;
-						tdt+= 3;
-					}
+				if(marker->flag&MARKER_DISABLED) {
+					td+= 3;
+					td2d+= 3;
+					tdt+= 3;
 				};
 			}
 		}