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

style cleanup: (indentation)

Browse Source
This commit is contained in:
Campbell Barton 2012-06-06 14:48:39 +00:00
parent 2cb671591b
commit 1931aac1f7
18 changed files with 988 additions and 988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_logic/logic_window.c
View File

@ -2532,7 +2532,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo
glRects(xco, yco-ysize, xco+width, yco); glRects(xco, yco-ysize, xco+width, yco);
uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
uiDefBut(block, TEX, 1, "File: ", xco+10, yco-44, width-20, 19, &(gma->filename), 0, sizeof(gma->filename), 0, 0, "Load this blend file, use the \"//\" prefix for a path relative to the current blend file"); uiDefBut(block, TEX, 1, "File: ", xco+10, yco-44, width-20, 19, &(gma->filename), 0, sizeof(gma->filename), 0, 0, "Load this blend file, use the \"//\" prefix for a path relative to the current blend file");
// uiDefBut(block, TEX, 1, "Anim: ", xco+10, yco-64, width-20, 19, &(gma->loadaniname), 0, sizeof(gma->loadaniname), 0, 0, "Use this loadinganimation"); // uiDefBut(block, TEX, 1, "Anim: ", xco+10, yco-64, width-20, 19, &(gma->loadaniname), 0, sizeof(gma->loadaniname), 0, 0, "Use this loadinganimation");
} }
#if 0 #if 0
else if (gma->type == ACT_GAME_START) { else if (gma->type == ACT_GAME_START) {

4
source/blender/nodes/composite/nodes/node_composite_math.c
View File

@ -180,12 +180,12 @@ static void node_composit_exec_math(void *UNUSED(data), bNode *node, bNodeStack
return; return;
} }
/*create output based on first input */ /* create output based on first input */
if (cbuf) { if (cbuf) {
stackbuf=alloc_compbuf(cbuf->x, cbuf->y, CB_VAL, 1); stackbuf=alloc_compbuf(cbuf->x, cbuf->y, CB_VAL, 1);
} }
/* and if it doesn't exist use the second input since we /* and if it doesn't exist use the second input since we
know that one of them must exist at this point*/ * know that one of them must exist at this point*/
else { else {
stackbuf=alloc_compbuf(cbuf2->x, cbuf2->y, CB_VAL, 1); stackbuf=alloc_compbuf(cbuf2->x, cbuf2->y, CB_VAL, 1);
} }