[Bf-blender-cvs] [b102472551c] master: Cleanup: style, use braces for nodes
Campbell Barton
noreply at git.blender.org
Mon Apr 22 13:15:42 CEST 2019
Commit: b102472551c351d8be8ebf96e3e44a5454f02d0a
Author: Campbell Barton
Date: Mon Apr 22 13:31:31 2019 +1000
Branches: master
https://developer.blender.org/rBb102472551c351d8be8ebf96e3e44a5454f02d0a
Cleanup: style, use braces for nodes
===================================================================
M source/blender/nodes/composite/node_composite_tree.c
M source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
M source/blender/nodes/composite/nodes/node_composite_image.c
M source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
M source/blender/nodes/composite/nodes/node_composite_outputFile.c
M source/blender/nodes/composite/nodes/node_composite_switchview.c
M source/blender/nodes/intern/node_common.c
M source/blender/nodes/intern/node_exec.c
M source/blender/nodes/intern/node_socket.c
M source/blender/nodes/intern/node_util.c
M source/blender/nodes/shader/node_shader_tree.c
M source/blender/nodes/shader/node_shader_util.c
M source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
M source/blender/nodes/shader/nodes/node_shader_common.c
M source/blender/nodes/shader/nodes/node_shader_invert.c
M source/blender/nodes/shader/nodes/node_shader_mapping.c
M source/blender/nodes/shader/nodes/node_shader_math.c
M source/blender/nodes/shader/nodes/node_shader_normal_map.c
M source/blender/nodes/shader/nodes/node_shader_script.c
M source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
M source/blender/nodes/shader/nodes/node_shader_tangent.c
M source/blender/nodes/shader/nodes/node_shader_tex_environment.c
M source/blender/nodes/shader/nodes/node_shader_tex_image.c
M source/blender/nodes/shader/nodes/node_shader_tex_sky.c
M source/blender/nodes/shader/nodes/node_shader_vectTransform.c
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/nodes/texture/node_texture_util.c
M source/blender/nodes/texture/nodes/node_texture_common.c
M source/blender/nodes/texture/nodes/node_texture_compose.c
M source/blender/nodes/texture/nodes/node_texture_curves.c
M source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
M source/blender/nodes/texture/nodes/node_texture_image.c
M source/blender/nodes/texture/nodes/node_texture_math.c
M source/blender/nodes/texture/nodes/node_texture_mixRgb.c
M source/blender/nodes/texture/nodes/node_texture_output.c
M source/blender/nodes/texture/nodes/node_texture_proc.c
===================================================================
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index 70f287134d1..fd6435312b9 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -89,8 +89,9 @@ static void free_node_cache(bNodeTree *UNUSED(ntree), bNode *node)
static void free_cache(bNodeTree *ntree)
{
bNode *node;
- for (node = ntree->nodes.first; node; node = node->next)
+ for (node = ntree->nodes.first; node; node = node->next) {
free_node_cache(ntree, node);
+ }
}
/* local tree then owns all compbufs */
@@ -109,10 +110,12 @@ static void localize(bNodeTree *UNUSED(localtree), bNodeTree *ntree)
if (ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
if (node->id) {
- if (node->flag & NODE_DO_OUTPUT)
+ if (node->flag & NODE_DO_OUTPUT) {
node->new_node->id = (ID *)node->id;
- else
+ }
+ else {
node->new_node->id = NULL;
+ }
}
}
@@ -150,8 +153,9 @@ static void local_merge(Main *bmain, bNodeTree *localtree, bNodeTree *ntree)
* and to achieve much better performance on further calls this context should be
* copied back to original node */
if (lnode->storage) {
- if (lnode->new_node->storage)
+ if (lnode->new_node->storage) {
BKE_tracking_distortion_free(lnode->new_node->storage);
+ }
lnode->new_node->storage = BKE_tracking_distortion_copy(lnode->storage);
}
@@ -253,12 +257,14 @@ void ntreeCompositUpdateRLayers(bNodeTree *ntree)
{
bNode *node;
- if (ntree == NULL)
+ if (ntree == NULL) {
return;
+ }
for (node = ntree->nodes.first; node; node = node->next) {
- if (node->type == CMP_NODE_R_LAYERS)
+ if (node->type == CMP_NODE_R_LAYERS) {
node_cmp_rlayers_outputs(ntree, node);
+ }
}
}
@@ -267,12 +273,14 @@ void ntreeCompositRegisterPass(
{
bNode *node;
- if (ntree == NULL)
+ if (ntree == NULL) {
return;
+ }
for (node = ntree->nodes.first; node; node = node->next) {
- if (node->type == CMP_NODE_R_LAYERS)
+ if (node->type == CMP_NODE_R_LAYERS) {
node_cmp_rlayers_register_pass(ntree, node, scene, view_layer, name, type);
+ }
}
}
@@ -290,10 +298,12 @@ void ntreeCompositTagRender(Scene *curscene)
bNode *node;
for (node = sce->nodetree->nodes.first; node; node = node->next) {
- if (node->id == (ID *)curscene || node->type == CMP_NODE_COMPOSITE)
+ if (node->id == (ID *)curscene || node->type == CMP_NODE_COMPOSITE) {
nodeUpdate(sce->nodetree, node);
- else if (node->type == CMP_NODE_TEXTURE) /* uses scene sizex/sizey */
+ }
+ else if (node->type == CMP_NODE_TEXTURE) /* uses scene sizex/sizey */ {
nodeUpdate(sce->nodetree, node);
+ }
}
}
}
@@ -304,12 +314,14 @@ void ntreeCompositClearTags(bNodeTree *ntree)
{
bNode *node;
- if (ntree == NULL)
+ if (ntree == NULL) {
return;
+ }
for (node = ntree->nodes.first; node; node = node->next) {
node->need_exec = 0;
- if (node->type == NODE_GROUP)
+ if (node->type == NODE_GROUP) {
ntreeCompositClearTags((bNodeTree *)node->id);
+ }
}
}
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
index 729252f0937..e4c9b8dd0cd 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
@@ -276,8 +276,9 @@ static void node_copy_cryptomatte(bNodeTree *UNUSED(dest_ntree), bNode *dest_nod
NodeCryptomatte *src_nc = src_node->storage;
NodeCryptomatte *dest_nc = MEM_dupallocN(src_nc);
- if (src_nc->matte_id)
+ if (src_nc->matte_id) {
dest_nc->matte_id = MEM_dupallocN(src_nc->matte_id);
+ }
dest_node->storage = dest_nc;
}
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index d4278b3b540..a1649d9f8f0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -90,8 +90,9 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree,
* Any dynamically allocated sockets follow afterwards, and are sorted in the order in which they were stored in the RenderResult.
* Therefore, we remember the index of the last matched socket. New sockets are placed behind the previously traversed one, but always after the first 31. */
int after_index = *prev_index;
- if (is_rlayers && after_index < 30)
+ if (is_rlayers && after_index < 30) {
after_index = 30;
+ }
if (rres_index >= 0) {
sock = node_add_socket_from_template(
@@ -158,10 +159,12 @@ static void cmp_node_image_create_outputs(bNodeTree *ntree,
RenderPass *rpass;
for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
int type;
- if (rpass->channels == 1)
+ if (rpass->channels == 1) {
type = SOCK_FLOAT;
- else
+ }
+ else {
type = SOCK_RGBA;
+ }
cmp_node_image_add_pass_output(ntree,
node,
@@ -345,10 +348,12 @@ static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node, bool rl
int sock_index;
/* XXX make callback */
- if (rlayer)
+ if (rlayer) {
cmp_node_rlayer_create_outputs(ntree, node, &available_sockets);
- else
+ }
+ else {
cmp_node_image_create_outputs(ntree, node, &available_sockets);
+ }
/* Get rid of sockets whose passes are not available in the image.
* If sockets that are not available would be deleted, the connections to them would be lost
@@ -368,8 +373,9 @@ static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node, bool rl
else {
bNodeLink *link;
for (link = ntree->links.first; link; link = link->next) {
- if (link->fromsock == sock)
+ if (link->fromsock == sock) {
break;
+ }
}
if (!link && (!rlayer || sock_index > 30)) {
MEM_freeN(sock->storage);
@@ -387,8 +393,9 @@ static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node, bool rl
static void cmp_node_image_update(bNodeTree *ntree, bNode *node)
{
/* avoid unnecessary updates, only changes to the image/image user data are of interest */
- if (node->update & NODE_UPDATE_ID)
+ if (node->update & NODE_UPDATE_ID) {
cmp_node_image_verify_outputs(ntree, node, false);
+ }
cmp_node_update_default(ntree, node);
}
@@ -411,8 +418,9 @@ static void node_composit_free_image(bNode *node)
bNodeSocket *sock;
/* free extra socket info */
- for (sock = node->outputs.first; sock; sock = sock->next)
+ for (sock = node->outputs.first; sock; sock = sock->next) {
MEM_freeN(sock->storage);
+ }
MEM_freeN(node->storage);
}
@@ -426,8 +434,9 @@ static void node_composit_copy_image(bNodeTree *UNUSED(dest_ntree),
dest_node->storage = MEM_dupallocN(src_node->storage);
/* copy extra socket info */
- for (sock = src_node->outputs.first; sock; sock = sock->next)
+ for (sock = src_node->outputs.first; sock; sock = sock->next) {
sock->new_sock->storage = MEM_dupallocN(sock->storage);
+ }
}
void register_node_type_cmp_image(void)
@@ -518,9 +527,11 @@ static bool node_composit_poll_rlayers(bNodeType *UNUSED(ntype), bNodeTree *ntre
* Render layers node can only be used in local scene->nodetree,
* since it directly links to the scene.
*/
- for (scene = G.main->scenes.first; scene; scene = scene->id.next)
- if (scene->nodetree == ntree)
+ for (scene = G.main->scenes.first; scene; scene = scene->id.next) {
+ if (scene->nodetree == ntree) {
break;
+ }
+ }
return (scene != NULL);
}
diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
index 144fe5c44aa..d4462d937ad 100644
--- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
+++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
@@ -39,10 +39,12 @@ static bNodeSocketTemplate cmp_node_moviedistortion_out[] = {
static void label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
{
- if (node->custom1 == 0)
+ if (node->custom1 == 0) {
BLI_strncpy(label, IFACE_("Undistortion"), maxlen);
- else
+ }
+ else {
BLI_strncpy(label, IFACE_("Distortion"), maxlen);
+ }
}
static void init(const bContext *C, PointerRNA *ptr)
@@ -55,16 +57,18 @@ static void init(const bContext *C, PointerRNA *ptr)
static void storage_free(bNode *node)
{
- if (node->storage)
+ if (node->storage) {
BKE_tracking_distortion_free(node->storage);
+ }
node->storage = NULL;
}
static void storage_copy(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bNode *src_node)
{
- if (src_node->storage)
+ if (src_node->storage) {
dest_node->storage = BKE_tracking_distortion_copy(src_node->storage);
+ }
}
void register_node_type_cmp_moviedistortion(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index 624065fa96d..806a05757d0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -46,8 +46,9 @@ static bool unique_path_unique_check(void *arg, const char *name)
for (sock = data->lb->first; sock; sock = sock->next) {
if (sock != data->sock) {
NodeImageMultiFileSocket *sockdata = sock->storage;
- if (STREQ(sockdata->path, name))
+ if (STREQ(sockdata->path, name)) {
return true;
+ }
}
}
return false;
@@ -66,8 +67,9 @@ void ntreeCompositOutputFileUniquePath(ListBase *list,
data.sock = sock;
/* See if we are given an empty string */
- if (ELEM(NULL, sock, defname))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list