Revision: 38092
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38092
Author: jbakker
Date: 2011-07-04 19:22:37 +0000 (Mon, 04 Jul 2011)
Log Message:
-----------
Updated the indent, sorry!
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_buttons.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2011-07-04 18:48:36 UTC
(rev 38091)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2011-07-04 19:22:37 UTC
(rev 38092)
@@ -87,9 +87,9 @@
void (*execfunc)(void *data, struct bNode *, struct bNodeStack **,
struct bNodeStack **);
/* this line is set on startup of blender */
- void (*uifunc)(struct uiLayout *, struct bContext *C, struct
PointerRNA *ptr);
- void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct
PointerRNA *ptr);
- const char *(*labelfunc)(struct bNode *);
+ void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA
*ptr);
+ void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct
PointerRNA *ptr);
+ const char *(*labelfunc)(struct bNode *);
void (*initfunc)(struct bNode *);
void (*freestoragefunc)(struct bNode *);
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-07-04
18:48:36 UTC (rev 38091)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-07-04
19:22:37 UTC (rev 38092)
@@ -3156,9 +3156,9 @@
if(!(passflag & SCE_PASS_INDIRECT)) sock->flag |= SOCK_UNAVAIL;
sock= BLI_findlink(&node->outputs, RRES_OUT_INDEXOB);
if(!(passflag & SCE_PASS_INDEXOB)) sock->flag |= SOCK_UNAVAIL;
- sock= BLI_findlink(&node->outputs, RRES_OUT_INDEXMA);
- if(!(passflag & SCE_PASS_INDEXMA)) sock->flag |= SOCK_UNAVAIL;
- sock= BLI_findlink(&node->outputs, RRES_OUT_MIST);
+ sock= BLI_findlink(&node->outputs, RRES_OUT_INDEXMA);
+ if(!(passflag & SCE_PASS_INDEXMA)) sock->flag |= SOCK_UNAVAIL;
+ sock= BLI_findlink(&node->outputs, RRES_OUT_MIST);
if(!(passflag & SCE_PASS_MIST)) sock->flag |= SOCK_UNAVAIL;
sock= BLI_findlink(&node->outputs, RRES_OUT_EMIT);
if(!(passflag & SCE_PASS_EMIT)) sock->flag |= SOCK_UNAVAIL;
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2011-07-04
18:48:36 UTC (rev 38091)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2011-07-04
19:22:37 UTC (rev 38092)
@@ -423,7 +423,7 @@
/* only once called */
static void node_shader_set_butfunc(bNodeType *ntype)
{
- ntype->uifuncbut = NULL;
+ ntype->uifuncbut = NULL;
switch(ntype->type) {
/* case NODE_GROUP: note, typeinfo for group is
generated... see "XXX ugly hack" */
@@ -473,7 +473,7 @@
default:
ntype->uifunc= NULL;
}
- if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
+ if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
}
/* ****************** BUTTON CALLBACKS FOR COMPOSITE NODES ***************** */
@@ -1040,31 +1040,28 @@
}
static void node_composit_buts_colorbalance_but(uiLayout *layout, bContext
*UNUSED(C), PointerRNA *ptr)
{
- uiItemR(layout, ptr, "correction_method", 0, NULL, ICON_NONE);
+ uiItemR(layout, ptr, "correction_method", 0, NULL, ICON_NONE);
- if (RNA_enum_get(ptr, "correction_method")== 0) {
+ if (RNA_enum_get(ptr, "correction_method")== 0) {
- uiTemplateColorWheel(layout, ptr, "lift", 1, 1, 0, 1);
- uiItemR(layout, ptr, "lift", 0, NULL, ICON_NONE);
+ uiTemplateColorWheel(layout, ptr, "lift", 1, 1, 0, 1);
+ uiItemR(layout, ptr, "lift", 0, NULL, ICON_NONE);
- uiTemplateColorWheel(layout, ptr, "gamma", 1, 1, 1, 1);
- uiItemR(layout, ptr, "gamma", 0, NULL, ICON_NONE);
+ uiTemplateColorWheel(layout, ptr, "gamma", 1, 1, 1, 1);
+ uiItemR(layout, ptr, "gamma", 0, NULL, ICON_NONE);
- uiTemplateColorWheel(layout, ptr, "gain", 1, 1, 1, 1);
- uiItemR(layout, ptr, "gain", 0, NULL, ICON_NONE);
+ uiTemplateColorWheel(layout, ptr, "gain", 1, 1, 1, 1);
+ uiItemR(layout, ptr, "gain", 0, NULL, ICON_NONE);
+ } else {
+ uiTemplateColorWheel(layout, ptr, "offset", 1, 1, 0, 1);
+ uiItemR(layout, ptr, "offset", 0, NULL, ICON_NONE);
- } else {
+ uiTemplateColorWheel(layout, ptr, "power", 1, 1, 0, 1);
+ uiItemR(layout, ptr, "power", 0, NULL, ICON_NONE);
- uiTemplateColorWheel(layout, ptr, "offset", 1, 1, 0, 1);
- uiItemR(layout, ptr, "offset", 0, NULL, ICON_NONE);
-
- uiTemplateColorWheel(layout, ptr, "power", 1, 1, 0, 1);
- uiItemR(layout, ptr, "power", 0, NULL, ICON_NONE);
-
- uiTemplateColorWheel(layout, ptr, "slope", 1, 1, 0, 1);
- uiItemR(layout, ptr, "slope", 0, NULL, ICON_NONE);
- }
-
+ uiTemplateColorWheel(layout, ptr, "slope", 1, 1, 0, 1);
+ uiItemR(layout, ptr, "slope", 0, NULL, ICON_NONE);
+ }
}
@@ -1081,7 +1078,7 @@
/* only once called */
static void node_composit_set_butfunc(bNodeType *ntype)
{
- ntype->uifuncbut = NULL;
+ ntype->uifuncbut = NULL;
switch(ntype->type) {
/* case NODE_GROUP: note, typeinfo for group is
generated... see "XXX ugly hack" */
@@ -1215,9 +1212,9 @@
ntype->uifunc=node_composit_buts_view_levels;
break;
case CMP_NODE_COLORBALANCE:
- ntype->uifunc=node_composit_buts_colorbalance;
- ntype->uifuncbut=node_composit_buts_colorbalance_but;
- break;
+ ntype->uifunc=node_composit_buts_colorbalance;
+ ntype->uifuncbut=node_composit_buts_colorbalance_but;
+ break;
case CMP_NODE_HUECORRECT:
ntype->uifunc=node_composit_buts_huecorrect;
break;
@@ -1231,7 +1228,7 @@
default:
ntype->uifunc= NULL;
}
- if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
+ if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
}
Modified: trunk/blender/source/blender/editors/space_node/node_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_buttons.c
2011-07-04 18:48:36 UTC (rev 38091)
+++ trunk/blender/source/blender/editors/space_node/node_buttons.c
2011-07-04 19:22:37 UTC (rev 38092)
@@ -118,8 +118,8 @@
uiItemS(layout);
/* draw this node's settings */
- if (node->typeinfo && node->typeinfo->uifuncbut)
- node->typeinfo->uifuncbut(layout, (bContext *)C, &ptr);
+ if (node->typeinfo && node->typeinfo->uifuncbut)
+ node->typeinfo->uifuncbut(layout, (bContext *)C, &ptr);
}
/* ******************* node buttons registration ************** */
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c
2011-07-04 18:48:36 UTC (rev 38091)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c
2011-07-04 19:22:37 UTC (rev 38092)
@@ -480,11 +480,11 @@
te->name= "Index Object";
te->directdata= &srl->passflag;
- te= outliner_add_element(soops, &tenla->subtree, id, tenla,
TSE_R_PASS, LOG2I(SCE_PASS_INDEXMA));
- te->name= "Index Material";
- te->directdata= &srl->passflag;
+ te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS,
LOG2I(SCE_PASS_INDEXMA));
+ te->name= "Index Material";
+ te->directdata= &srl->passflag;
- te= outliner_add_element(soops, &tenla->subtree, id, tenla,
TSE_R_PASS, LOG2I(SCE_PASS_RGBA));
+ te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS,
LOG2I(SCE_PASS_RGBA));
te->name= "Color";
te->directdata= &srl->passflag;
Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_material.c 2011-07-04
18:48:36 UTC (rev 38091)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c 2011-07-04
19:22:37 UTC (rev 38092)
@@ -1676,10 +1676,10 @@
RNA_def_property_ui_text(prop, "Light Group", "Limit lighting to lamps
in this Group");
RNA_def_property_update(prop, 0, "rna_Material_update");
- prop= RNA_def_property(srna, "pass_index", PROP_INT, PROP_UNSIGNED);
- RNA_def_property_int_sdna(prop, NULL, "index");
- RNA_def_property_ui_text(prop, "Pass Index", "Index # for the IndexMA
render pass");
- RNA_def_property_update(prop, NC_OBJECT, NULL);
+ prop= RNA_def_property(srna, "pass_index", PROP_INT, PROP_UNSIGNED);
+ RNA_def_property_int_sdna(prop, NULL, "index");
+ RNA_def_property_ui_text(prop, "Pass Index", "Index # for the IndexMA
render pass");
+ RNA_def_property_update(prop, NC_OBJECT, NULL);
/* flags */
Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c 2011-07-04
18:48:36 UTC (rev 38091)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c 2011-07-04
19:22:37 UTC (rev 38092)
@@ -388,8 +388,8 @@
{SCE_PASS_MIST, "MIST", 0, "Mist", ""},
{SCE_PASS_EMIT, "EMIT", 0, "Emit", ""},
{SCE_PASS_ENVIRONMENT, "ENVIRONMENT", 0, "Environment", ""},
- {SCE_PASS_INDEXMA, "MATERIAL_INDEX", 0, "Material Index", ""},
- {0, NULL, 0, NULL, NULL}};
+ {SCE_PASS_INDEXMA, "MATERIAL_INDEX", 0, "Material Index", ""},
+ {0, NULL, 0, NULL, NULL}};
srna= RNA_def_struct(brna, "RenderPass", NULL);
RNA_def_struct_ui_text(srna, "Render Pass", "");
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-07-04
18:48:36 UTC (rev 38091)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-07-04
19:22:37 UTC (rev 38092)
@@ -1515,13 +1515,13 @@
if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS,
"rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- prop= RNA_def_property(srna, "use_pass_material_index", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "passflag",
SCE_PASS_INDEXMA);
- RNA_def_property_ui_text(prop, "Material Index", "Deliver material
index pass");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
