[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35517] trunk/blender/source/blender/ editors/interface/interface_icons.c: fix mistake from commit rev.

Andrea Weikert elubie at gmx.net
Sun Mar 13 18:20:53 CET 2011


Revision: 35517
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35517
Author:   elubie
Date:     2011-03-13 17:20:52 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
fix mistake from commit rev. 33868. The variable icon was a pointer, not an integer icon id (ICON_NONE).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_icons.c

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2011-03-13 13:09:18 UTC (rev 35516)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2011-03-13 17:20:52 UTC (rev 35517)
@@ -754,7 +754,7 @@
 
 	icon = BKE_icon_get(icon_id);
 	
-	if (icon==ICON_NONE) {
+	if (icon==NULL) {
 		if (G.f & G_DEBUG)
 			printf("UI_icon_get_width: Internal error, no icon for icon ID: %d\n", icon_id);
 		return 0;
@@ -779,7 +779,7 @@
 
 	icon = BKE_icon_get(icon_id);
 	
-	if (icon==ICON_NONE) {
+	if (icon==NULL) {
 		if (G.f & G_DEBUG)
 			printf("UI_icon_get_height: Internal error, no icon for icon ID: %d\n", icon_id);
 		return 0;
@@ -955,7 +955,7 @@
 	
 	icon = BKE_icon_get(icon_id);
 	
-	if (icon==ICON_NONE) {
+	if (icon==NULL) {
 		if (G.f & G_DEBUG)
 			printf("icon_draw_mipmap: Internal error, no icon for icon ID: %d\n", icon_id);
 		return;
@@ -980,7 +980,7 @@
 		di->data.vector.func((int)x, (int)y, ICON_DEFAULT_HEIGHT, ICON_DEFAULT_HEIGHT, 1.0f); 
 	} 
 	else if(di->type == ICON_TYPE_TEXTURE) {
-		icon_draw_texture(x, y, w, h, di->data.texture.x, di->data.texture.y,
+		icon_draw_texture(x, y, (float)w, (float)h, di->data.texture.x, di->data.texture.y,
 			di->data.texture.w, di->data.texture.h, alpha, rgb);
 	}
 	else if(di->type == ICON_TYPE_BUFFER) {




More information about the Bf-blender-cvs mailing list