[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55380] trunk/blender/source/blender: quiet warning about writing to deprecated member with gcc.

[Campbell Barton]

Revision: 55380
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55380
Author:   campbellbarton
Date:     2013-03-18 18:37:59 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
quiet warning about writing to deprecated member with gcc.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/editors/interface/interface_widgets.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-03-18 18:29:22 UTC (rev 55379)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-03-18 18:37:59 UTC (rev 55380)
@@ -2005,8 +2005,19 @@
 	 * Node sockets generally use the identifier string instead now,
 	 * but reconstructing own_index in writefile.c would require parsing the identifier string.
 	 */
+
+#ifdef __GNUC__
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 	sock->own_index = own_index;
+
+#ifdef __GNUC__
+#  pragma GCC diagnostic pop
 #endif
+
+#endif  /* USE_NODE_COMPAT_CUSTOMNODES */
 	
 	sock->limit = (in_out == SOCK_IN ? 1 : 0xFFF);
 	

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-03-18 18:29:22 UTC (rev 55379)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-03-18 18:37:59 UTC (rev 55380)
@@ -1272,7 +1272,7 @@
 /* draws text and icons for buttons */
 static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *but, rcti *rect)
 {
-	float alpha = (float)wcol->text[3] / 255.0;
+	float alpha = (float)wcol->text[3] / 255.0f;
 	char password_str[UI_MAX_DRAW_STR];
 
 	if (but == NULL)