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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-15 07:58:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-15 07:58:55 +0300
commit687ff699e98e54acf8ce6fa705bc8ee5ccd3fddf (patch)
tree611e29781af4937b357f3e2c54742b1922f15a37 /source/blender/nodes/composite/nodes/node_composite_image.c
parent890d871bc32fed7bee352f88c34d8157fd234596 (diff)
Cleanup: warnings, style
Diffstat (limited to 'source/blender/nodes/composite/nodes/node_composite_image.c')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_image.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index f1fdaa32ce4..e958ab9a3dc 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -107,8 +107,8 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, bNode *node,
BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name));
- sock_index = BLI_listbase_count(&node->outputs)-1;
- if (sock_index != after_index+1) {
+ sock_index = BLI_listbase_count(&node->outputs) - 1;
+ if (sock_index != after_index + 1) {
bNodeSocket *after_sock = BLI_findlink(&node->outputs, after_index);
BLI_remlink(&node->outputs, sock);
BLI_insertlinkafter(&node->outputs, after_sock, sock);
@@ -218,9 +218,9 @@ static void cmp_node_rlayer_create_outputs(bNodeTree *ntree, bNode *node, LinkNo
if (scene) {
RenderEngineType *engine_type = RE_engines_find(scene->r.engine);
- if(engine_type && engine_type->update_render_passes) {
+ if (engine_type && engine_type->update_render_passes) {
SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, node->custom1);
- if(srl) {
+ if (srl) {
RLayerUpdateData *data = MEM_mallocN(sizeof(RLayerUpdateData), "render layer update data");
data->available_sockets = available_sockets;
data->prev_index = -1;
@@ -351,9 +351,9 @@ void node_cmp_rlayers_outputs(bNodeTree *ntree, bNode *node)
cmp_node_image_verify_outputs(ntree, node, true);
}
-const char* node_cmp_rlayers_sock_to_pass(int sock_index)
+const char *node_cmp_rlayers_sock_to_pass(int sock_index)
{
- const char* sock_to_passname[] = {
+ const char *sock_to_passname[] = {
RE_PASSNAME_COMBINED, RE_PASSNAME_COMBINED,
RE_PASSNAME_Z, RE_PASSNAME_NORMAL, RE_PASSNAME_UV, RE_PASSNAME_VECTOR, RE_PASSNAME_RGBA,
RE_PASSNAME_DIFFUSE, RE_PASSNAME_SPEC, RE_PASSNAME_SHADOW, RE_PASSNAME_AO,
@@ -378,8 +378,7 @@ static void node_composit_init_rlayers(const bContext *C, PointerRNA *ptr)
node->id = &scene->id;
- for (bNodeSocket *sock = node->outputs.first; sock; sock = sock->next, sock_index++)
- {
+ for (bNodeSocket *sock = node->outputs.first; sock; sock = sock->next, sock_index++) {
NodeImageLayer *sockdata = MEM_callocN(sizeof(NodeImageLayer), "node image layer");
sock->storage = sockdata;