Commit: b7394eeadacafba8bef5dd12741cba133209d270
Author: Habib Gahbiche
Date: Tue Mar 16 22:05:30 2021 +0100
Branches: compositor-anti-aliasing
https://developer.blender.org/rBb7394eeadacafba8bef5dd12741cba133209d270
Compositor Anti-Aliasing: addressed comments from code review
- Made node slightly larger to make text fit
- Renamed "Local Contrast Adaptation Factor" to "Contrast Limit"
- Removed unused enum
- Style: added brackets around if
- Style: Ran make format (excluded changes from unrelated files)
===================================================================
M source/blender/blenkernel/intern/node.c
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/compositor/nodes/COM_AntiAliasingNode.cc
M source/blender/compositor/nodes/COM_AntiAliasingNode.h
M source/blender/compositor/operations/COM_SMAAOperation.cc
M source/blender/compositor/operations/COM_SMAAOperation.h
M source/blender/editors/space_node/drawnode.c
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/composite/nodes/node_composite_antialiasing.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node.c
b/source/blender/blenkernel/intern/node.c
index 5dc45996b30..95013264026 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -31,20 +31,20 @@
#include "MEM_guardedalloc.h"
-#include <stdlib.h>
+#include <limits.h>
#include <stddef.h>
+#include <stdlib.h>
#include <string.h>
-#include <limits.h>
#include "DNA_action_types.h"
#include "DNA_anim_types.h"
#include "DNA_lamp_types.h"
+#include "DNA_linestyle_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"
#include "DNA_world_types.h"
-#include "DNA_linestyle_types.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
@@ -69,10 +69,10 @@
#include "RNA_access.h"
#include "RNA_define.h"
-#include "NOD_socket.h"
#include "NOD_common.h"
#include "NOD_composite.h"
#include "NOD_shader.h"
+#include "NOD_socket.h"
#include "NOD_texture.h"
#define NODE_DEFAULT_MAX_WIDTH 700
@@ -82,28 +82,27 @@ bNodeTreeType NodeTreeTypeUndefined;
bNodeType NodeTypeUndefined;
bNodeSocketType NodeSocketTypeUndefined;
-
static void node_add_sockets_from_type(bNodeTree *ntree, bNode *node,
bNodeType *ntype)
{
- bNodeSocketTemplate *sockdef;
- /* bNodeSocket *sock; */ /* UNUSED */
+ bNodeSocketTemplate *sockdef;
+ /* bNodeSocket *sock; */ /* UNUSED */
- if (ntype->inputs) {
- sockdef = ntype->inputs;
- while (sockdef->type != -1) {
- /* sock = */ node_add_socket_from_template(ntree, node,
sockdef, SOCK_IN);
+ if (ntype->inputs) {
+ sockdef = ntype->inputs;
+ while (sockdef->type != -1) {
+ /* sock = */ node_add_socket_from_template(ntree, node, sockdef,
SOCK_IN);
- sockdef++;
- }
- }
- if (ntype->outputs) {
- sockdef = ntype->outputs;
- while (sockdef->type != -1) {
- /* sock = */ node_add_socket_from_template(ntree, node,
sockdef, SOCK_OUT);
+ sockdef++;
+ }
+ }
+ if (ntype->outputs) {
+ sockdef = ntype->outputs;
+ while (sockdef->type != -1) {
+ /* sock = */ node_add_socket_from_template(ntree, node, sockdef,
SOCK_OUT);
- sockdef++;
- }
- }
+ sockdef++;
+ }
+ }
}
/* Note: This function is called to initialize node data based on the type.
@@ -112,184 +111,194 @@ static void node_add_sockets_from_type(bNodeTree
*ntree, bNode *node, bNodeType
*/
static void node_init(const struct bContext *C, bNodeTree *ntree, bNode *node)
{
- bNodeType *ntype = node->typeinfo;
- if (ntype == &NodeTypeUndefined)
- return;
+ bNodeType *ntype = node->typeinfo;
+ if (ntype == &NodeTypeUndefined)
+ return;
- /* only do this once */
- if (node->flag & NODE_INIT)
- return;
+ /* only do this once */
+ if (node->flag & NODE_INIT)
+ return;
- node->flag = NODE_SELECT | NODE_OPTIONS | ntype->flag;
- node->width = ntype->width;
- node->miniwidth = 42.0f;
- node->height = ntype->height;
- node->color[0] = node->color[1] = node->color[2] = 0.608; /* default
theme color */
- /* initialize the node name with the node label.
- * note: do this after the initfunc so nodes get their data set which
may be used in naming
- * (node groups for example) */
- /* XXX Do not use nodeLabel() here, it returns translated content for
UI, which should *only* be used
- * in UI, *never* in data... Data have their own translation option!
- * This solution may be a bit rougher than nodeLabel()'s returned
string, but it's simpler
- * than adding "do_translate" flags to this func (and labelfunc()
as well). */
- BLI_strncpy(node->name, DATA_(ntype->ui_name), NODE_MAXSTR);
- nodeUniqueName(ntree, node);
-
- node_add_sockets_from_type(ntree, node, ntype);
-
- if (ntype->initfunc != NULL)
- ntype->initfunc(ntree, node);
-
- if (ntree->typeinfo->node_add_init != NULL)
- ntree->typeinfo->node_add_init(ntree, node);
-
- /* extra init callback */
- if (ntype->initfunc_api) {
- PointerRNA ptr;
- RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr);
-
- /* XXX Warning: context can be NULL in case nodes are added in
do_versions.
- * Delayed init is not supported for nodes with context-based
initfunc_api atm.
- */
- BLI_assert(C != NULL);
- ntype->initfunc_api(C, &ptr);
- }
+ node->flag = NODE_SELECT | NODE_OPTIONS | ntype->flag;
+ node->width = ntype->width;
+ node->miniwidth = 42.0f;
+ node->height = ntype->height;
+ node->color[0] = node->color[1] = node->color[2] = 0.608; /* default theme
color */
+ /* initialize the node name with the node label.
+ * note: do this after the initfunc so nodes get their data set which may be
used in naming
+ * (node groups for example) */
+ /* XXX Do not use nodeLabel() here, it returns translated content for UI,
which should *only* be
+ * used in UI, *never* in data... Data have their own translation option!
This solution may be a
+ * bit rougher than nodeLabel()'s returned string, but it's simpler than
adding "do_translate"
+ * flags to this func (and labelfunc() as well). */
+ BLI_strncpy(node->name, DATA_(ntype->ui_name), NODE_MAXSTR);
+ nodeUniqueName(ntree, node);
+
+ node_add_sockets_from_type(ntree, node, ntype);
+
+ if (ntype->initfunc != NULL)
+ ntype->initfunc(ntree, node);
+
+ if (ntree->typeinfo->node_add_init != NULL)
+ ntree->typeinfo->node_add_init(ntree, node);
+
+ /* extra init callback */
+ if (ntype->initfunc_api) {
+ PointerRNA ptr;
+ RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr);
+
+ /* XXX Warning: context can be NULL in case nodes are added in do_versions.
+ * Delayed init is not supported for nodes with context-based initfunc_api
atm.
+ */
+ BLI_assert(C != NULL);
+ ntype->initfunc_api(C, &ptr);
+ }
- if (node->id)
- id_us_plus(node->id);
+ if (node->id)
+ id_us_plus(node->id);
- node->flag |= NODE_INIT;
+ node->flag |= NODE_INIT;
}
static void ntree_set_typeinfo(bNodeTree *ntree, bNodeTreeType *typeinfo)
{
- if (typeinfo) {
- ntree->typeinfo = typeinfo;
+ if (typeinfo) {
+ ntree->typeinfo = typeinfo;
- /* deprecated integer type */
- ntree->type = typeinfo->type;
- }
- else {
- ntree->typeinfo = &NodeTreeTypeUndefined;
+ /* deprecated integer type */
+ ntree->type = typeinfo->type;
+ }
+ else {
+ ntree->typeinfo = &NodeTreeTypeUndefined;
- ntree->init &= ~NTREE_TYPE_INIT;
- }
+ ntree->init &= ~NTREE_TYPE_INIT;
+ }
}
-static void node_set_typeinfo(const struct bContext *C, bNodeTree *ntree,
bNode *node, bNodeType *typeinfo)
+static void node_set_typeinfo(const struct bContext *C,
+ bNodeTree *ntree,
+ bNode *node,
+ bNodeType *typeinfo)
{
- /* for nodes saved in older versions storage can get lost, make
undefined then */
- if (node->flag & NODE_INIT) {
- if (typeinfo && typeinfo->storagename[0] && !node->storage)
- typeinfo = NULL;
- }
+ /* for nodes saved in older versions storage can get lost, make undefined
then */
+ if (node->flag & NODE_INIT) {
+ if (typeinfo && typeinfo->storagename[0] && !node->storage)
+ typeinfo = NULL;
+ }
- if (typeinfo) {
- node->typeinfo = typeinfo;
+ if (typeinfo) {
+ node->typeinfo = typeinfo;
- /* deprecated integer type */
- node->type = typeinfo->type;
+ /* deprecated integer type */
+ node->type = typeinfo->type;
- /* initialize the node if necessary */
- node_init(C, ntree, node);
- }
- else {
- node->typeinfo = &NodeTypeUndefined;
+ /* initialize the node if necessary */
+ node_init(C, ntree, node);
+ }
+ else {
+ node->typeinfo = &NodeTypeUndefined;
- ntree->init &= ~NTREE_TYPE_INIT;
- }
+ ntree->init &= ~NTREE_TYPE_INIT;
+ }
}
-static void node_socket_set_typeinfo(bNodeTree *ntree, bNodeSocket *sock,
bNodeSocketType *typeinfo)
+static void node_socket_set_typeinfo(bNodeTree *ntree,
+ bNodeSocket *sock,
+ bNodeSocketType *typeinfo)
{
- if (typeinfo) {
- sock->typeinfo = typeinfo;
+ if (typeinfo) {
+ sock->typeinfo = typeinfo;
- /* deprecated integer type */
- sock->type = typeinfo->type;
+ /* deprecated integer type */
+ sock->type = typeinfo->type;
- if (sock->default_value == NULL) {
- /* initialize the default_value pointer used by
standard socket types */
- node_socket_init_default_value(sock);
- }
- }
- else {
- sock->typeinfo = &NodeSocketTypeUndefined;
+ if (sock->default_value == NULL) {
+ /* initialize the default_value pointer used by standard socket types */
+ node_socket_init_default_value(sock);
+ }
+ }
+ else {
+ sock->typeinfo = &NodeSocketTypeUndefined;
- ntree->init &= ~NTREE_TYPE_INIT;
- }
+ ntree->init &= ~NTREE_TYPE_INIT;
+ }
}
/* Set specific typeinfo pointers in all node trees on register/unregister */
-static void update_typeinfo(Main *bmain, const struct bContext *C,
bNodeTreeType *treetype, bNodeType *nodetype, bNodeSocketType *socktype, bool
unregister)
-{
- if (!bmain)
- return;
-
- FOREACH_NODETREE(bmain, ntree, id) {
- bNode *node;
- bNodeSocket *sock;
-
- ntree->init |= NTREE_TYPE_INIT;
-
- if (treetype && STREQ(ntree->idname, treetype->idname))
- ntree_set_typeinfo(ntree, unregister ? NULL : treetype);
-
- /* initialize nodes */
- for (node = ntree->nodes.first; node; node = node->next) {
- if (nodetype && STREQ(node->idname, nodetype->idname))
- node_set_typeinfo(C, ntree, node, unregister ?
NULL : nodetype);
-
- /* initialize node sockets */
- for (sock = node->inputs.first; sock; sock = sock->next)
- if (socktype && STREQ(sock->idname,
socktype->idname))
- node_socket_set_typeinfo(ntree, sock,
unregister ? NULL : socktype);
- for (sock = node->outputs.first; sock; sock =
sock->next)
- if (socktype && STREQ(sock->idname,
socktype->idname))
- node_socket_set_typeinfo(ntree, sock,
unregister ? NULL : socktype);
- }
-
- /* initialize tree sockets */
- for (sock = ntree->inputs.first; sock; sock = sock->next)
- if (socktype && STREQ(sock->idname, socktype->idname))
- node_socket_set_typeinfo(ntree, sock,
unregister ? NULL : socktype);
- for (sock = ntree->outputs.first; sock; sock = sock->next)
- if (socktype && STRE
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
