[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48289] branches/soc-2011-tomato: Merging r48284 through r48288 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 48289
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48289
Author:   nazgul
Date:     2012-06-25 19:52:07 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Merging r48284 through r48288 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    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-48283
   + /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-48288


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-48283
   + /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-48288

Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c	2012-06-25 19:48:05 UTC (rev 48288)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c	2012-06-25 19:52:07 UTC (rev 48289)
@@ -1376,9 +1376,11 @@
 		ui_draw_gradient(&grid, col, UI_GRAD_H, 1.0f);
 
 		/* grid, hsv uses different grid */
-		gl_shaded_color((unsigned char *)wcol->inner, -16);
-		/* TODO, grid lines does not line up with colors, need to look into this */
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glColor4ub(0, 0, 0, 48);
 		ui_draw_but_curve_grid(rect, zoomx, zoomy, offsx, offsy, 0.1666666f);
+		glDisable(GL_BLEND);
 	}
 	else {
 		if (cumap->flag & CUMA_DO_CLIP) {

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c	2012-06-25 19:48:05 UTC (rev 48288)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c	2012-06-25 19:52:07 UTC (rev 48289)
@@ -177,6 +177,13 @@
 	 * mainly this is sued for transformation stuff
 	 */
 
+	if (!sc->clip) {
+		*aspx = 1.0f;
+		*aspy = 1.0f;
+
+		return;
+	}
+
 	ED_space_clip_get_aspect(sc, aspx, aspy);
 	BKE_movieclip_get_size(sc->clip, &sc->user, &w, &h);
 


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-48283
   + /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-48288

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-25 19:48:05 UTC (rev 48288)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2012-06-25 19:52:07 UTC (rev 48289)
@@ -5913,9 +5913,12 @@
 
 	t->total = 0;
 
+	if (!clip)
+		return;
+
 	BKE_movieclip_get_size(clip, &sc->user, &width, &height);
 
-	if (!clip || width == 0 || height == 0)
+	if (width == 0 || height == 0)
 		return;
 
 	if (ar->regiontype == RGN_TYPE_PREVIEW) {