kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Minor fixes for some unfounded clang warnings.

Browse Source
This commit is contained in:
Lukas Toenne 2011-09-08 07:01:29 +00:00
parent 939a733659
commit 595ed90fe3
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/space_node/drawnode.c
View File

@ -660,6 +660,7 @@ static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *nt
* 1) input: not internal * 1) input: not internal
* 2) output: (node type uses const outputs) and (group output is unlinked) * 2) output: (node type uses const outputs) and (group output is unlinked)
*/ */
draw_value = 0;
switch (in_out) { switch (in_out) {
case SOCK_IN: case SOCK_IN:
draw_value = !(gsock && (gsock->flag & SOCK_INTERNAL)); draw_value = !(gsock && (gsock->flag & SOCK_INTERNAL));
@ -667,8 +668,6 @@ static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *nt
case SOCK_OUT: case SOCK_OUT:
if (gnode->typeinfo->flag & NODE_CONST_OUTPUT) if (gnode->typeinfo->flag & NODE_CONST_OUTPUT)
draw_value = !(gsock && gsock->link); draw_value = !(gsock && gsock->link);
else
draw_value = 0;
break; break;
} }
if (draw_value) { if (draw_value) {

2
source/blender/editors/space_node/node_draw.c
View File

@ -220,7 +220,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
PointerRNA ptr; PointerRNA ptr;
bNodeSocket *nsock; bNodeSocket *nsock;
float locx, locy; float locx, locy;
float dy= locy; float dy;
int buty; int buty;
/* get "global" coords */ /* get "global" coords */

2
source/blender/editors/space_node/node_edit.c
View File

@ -792,7 +792,7 @@ static int edit_node_invoke_properties(bContext *C, wmOperator *op)
static void edit_node_properties_get(wmOperator *op, bNodeTree *ntree, bNode **rnode, bNodeSocket **rsock, int *rin_out) static void edit_node_properties_get(wmOperator *op, bNodeTree *ntree, bNode **rnode, bNodeSocket **rsock, int *rin_out)
{ {
bNode *node; bNode *node;
bNodeSocket *sock; bNodeSocket *sock=NULL;
char nodename[32]; char nodename[32];
int sockindex; int sockindex;
int in_out; int in_out;