Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-03-18 22:37:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-18 22:37:59 +0400
commitb38870ce25a99037d7b9836a4f5a1133043e01f7 (patch)
tree8d902f43ad1a8d7695ac118a4e4651ed9829cb7c /source
parent25fa2eedc48da871f5b42b95520fd1439a9116b1 (diff)
quiet warning about writing to deprecated member with gcc.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/node.c11
-rw-r--r--source/blender/editors/interface/interface_widgets.c2
2 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 94feaed022f..c03e7bc7eac 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2005,8 +2005,19 @@ static bNodeSocket *make_socket_template(bNodeTree *ntree, int in_out,
* 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);
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 12738ed9c5f..f2e553bd140 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1272,7 +1272,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
/* 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)