[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56540] trunk/blender/source/blender: remove unneeded null check in draw_viewport_name

Campbell Barton ideasman42 at gmail.com
Wed May 8 14:53:15 CEST 2013


Revision: 56540
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56540
Author:   campbellbarton
Date:     2013-05-08 12:53:14 +0000 (Wed, 08 May 2013)
Log Message:
-----------
remove unneeded null check in draw_viewport_name

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/text.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c	2013-05-08 12:40:23 UTC (rev 56539)
+++ trunk/blender/source/blender/blenkernel/intern/text.c	2013-05-08 12:53:14 UTC (rev 56540)
@@ -1148,9 +1148,6 @@
 	txt_pop_sel(text);
 }
 
-/* never used: CVS 1.19 */
-/*  static void txt_pop_selr (Text *text) */
-
 void txt_pop_sel(Text *text)
 {
 	text->sell = text->curl;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-05-08 12:40:23 UTC (rev 56539)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2013-05-08 12:53:14 UTC (rev 56540)
@@ -863,14 +863,12 @@
 		name = tmpstr;
 	}
 
-	if (name) {
-		UI_ThemeColor(TH_TEXT_HI);
+	UI_ThemeColor(TH_TEXT_HI);
 #ifdef WITH_INTERNATIONAL
-		BLF_draw_default(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
+	BLF_draw_default(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
 #else
-		BLF_draw_default_ascii(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
+	BLF_draw_default_ascii(U.widget_unit + rect->xmin,  rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr));
 #endif
-	}
 }
 
 /* draw info beside axes in bottom left-corner: 




More information about the Bf-blender-cvs mailing list