griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use nullptr, function style casts, use ELEM macro

Browse Source
This commit is contained in:
Campbell Barton
2023-06-28 11:14:02 +10:00
parent 93b0be468f
commit 2f1230593c
9 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/vfontdata_freetype.c
View File

@@ -212,7 +212,7 @@ static VChar *freetypechar_to_vchar(FT_Face face, FT_ULong charcode, const VFont
return NULL;
}
VChar *che = (VChar *)MEM_callocN(sizeof(struct VChar), "objfnt_char");
VChar *che = (VChar *)MEM_callocN(sizeof(VChar), "objfnt_char");
freetype_outline_to_curves(face->glyph->outline, &che->nurbsbase, vfd->scale);
che->index = charcode;
che->width = face->glyph->advance.x * vfd->scale;

46
source/blender/blenloader/intern/versioning_280.cc
View File

@@ -1195,7 +1195,7 @@ static void displacement_node_insert(bNodeTree *ntree)
nodeRemLink(ntree, link);
/* Add displacement node. */
bNode *node = nodeAddStaticNode(NULL, ntree, SH_NODE_DISPLACEMENT);
bNode *node = nodeAddStaticNode(nullptr, ntree, SH_NODE_DISPLACEMENT);
node->locx = 0.5f * (fromnode->locx + tonode->locx);
node->locy = 0.5f * (fromnode->locy + tonode->locy);
@@ -1272,7 +1272,7 @@ static void square_roughness_node_insert(bNodeTree *ntree)
nodeRemLink(ntree, link);
/* Add sqrt node. */
bNode *node = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
bNode *node = nodeAddStaticNode(nullptr, ntree, SH_NODE_MATH);
node->custom1 = NODE_MATH_POWER;
node->locx = 0.5f * (fromnode->locx + tonode->locx);
node->locy = 0.5f * (fromnode->locy + tonode->locy);
@@ -1364,7 +1364,7 @@ static void ambient_occlusion_node_relink(bNodeTree *ntree)
static void image_node_colorspace(bNode *node)
{
if (node->id == NULL) {
if (node->id == nullptr) {
return;
}
@@ -1402,11 +1402,11 @@ static void light_emission_node_to_energy(Light *light, float *energy, float col
/* Find emission node */
bNode *output_node = ntreeShaderOutputNode(ntree, SHD_OUTPUT_CYCLES);
if (output_node == NULL) {
if (output_node == nullptr) {
return;
}
bNode *emission_node = NULL;
bNode *emission_node = nullptr;
LISTBASE_FOREACH (bNodeLink *, link, &ntree->links) {
if (link->tonode == output_node && link->fromnode->type == SH_NODE_EMISSION) {
emission_node = link->fromnode;
@@ -1414,7 +1414,7 @@ static void light_emission_node_to_energy(Light *light, float *energy, float col
}
}
if (emission_node == NULL) {
if (emission_node == nullptr) {
return;
}
@@ -1536,12 +1536,12 @@ static void update_vector_math_node_add_and_subtract_operators(bNodeTree *ntree)
ELEM(node->custom1, NODE_VECTOR_MATH_ADD, NODE_VECTOR_MATH_SUBTRACT))
{
bNode *absNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
bNode *absNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
absNode->custom1 = NODE_VECTOR_MATH_ABSOLUTE;
absNode->locx = node->locx + node->width + 20.0f;
absNode->locy = node->locy;
bNode *dotNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
bNode *dotNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
dotNode->custom1 = NODE_VECTOR_MATH_DOT_PRODUCT;
dotNode->locx = absNode->locx + absNode->width + 20.0f;
dotNode->locy = absNode->locy;
@@ -1627,7 +1627,7 @@ static void update_vector_math_node_cross_product_operator(bNodeTree *ntree)
if (node->custom1 == NODE_VECTOR_MATH_CROSS_PRODUCT) {
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
if (version_node_socket_is_used(sockOutVector)) {
bNode *normalizeNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
bNode *normalizeNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
normalizeNode->custom1 = NODE_VECTOR_MATH_NORMALIZE;
normalizeNode->locx = node->locx + node->width + 20.0f;
normalizeNode->locy = node->locy;
@@ -1648,7 +1648,7 @@ static void update_vector_math_node_cross_product_operator(bNodeTree *ntree)
bNodeSocket *sockOutValue = nodeFindSocket(node, SOCK_OUT, "Value");
if (version_node_socket_is_used(sockOutValue)) {
bNode *lengthNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
bNode *lengthNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
lengthNode->custom1 = NODE_VECTOR_MATH_LENGTH;
lengthNode->locx = node->locx + node->width + 20.0f;
if (version_node_socket_is_used(sockOutVector)) {
@@ -1697,7 +1697,7 @@ static void update_vector_math_node_normalize_operator(bNodeTree *ntree)
{
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
if (version_node_socket_is_used(sockOutVector)) {
bNode *lengthNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
bNode *lengthNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
lengthNode->custom1 = NODE_VECTOR_MATH_LENGTH;
lengthNode->locx = node->locx + node->width + 20.0f;
lengthNode->locy = node->locy;
@@ -1784,7 +1784,7 @@ static void update_vector_math_node_average_operator(bNodeTree *ntree)
node->custom1 = NODE_VECTOR_MATH_ADD;
bNodeSocket *sockOutVector = nodeFindSocket(node, SOCK_OUT, "Vector");
if (version_node_socket_is_used(sockOutVector)) {
bNode *normalizeNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
bNode *normalizeNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
normalizeNode->custom1 = NODE_VECTOR_MATH_NORMALIZE;
normalizeNode->locx = node->locx + node->width + 20.0f;
normalizeNode->locy = node->locy;
@@ -1805,7 +1805,7 @@ static void update_vector_math_node_average_operator(bNodeTree *ntree)
bNodeSocket *sockOutValue = nodeFindSocket(node, SOCK_OUT, "Value");
if (version_node_socket_is_used(sockOutValue)) {
bNode *lengthNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
bNode *lengthNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
lengthNode->custom1 = NODE_VECTOR_MATH_LENGTH;
lengthNode->locx = node->locx + node->width + 20.0f;
if (version_node_socket_is_used(sockOutVector)) {
@@ -1948,9 +1948,9 @@ static void update_mapping_node_inputs_and_properties(bNodeTree *ntree)
bNodeSocket *sockScale = nodeFindSocket(node, SOCK_IN, "Scale");
copy_v3_v3(version_cycles_node_socket_vector_value(sockScale), mapping->size);
bNode *maximumNode = NULL;
bNode *maximumNode = nullptr;
if (mapping->flag & TEXMAP_CLIP_MIN) {
maximumNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
maximumNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
maximumNode->custom1 = NODE_VECTOR_MATH_MAXIMUM;
if (mapping->flag & TEXMAP_CLIP_MAX) {
maximumNode->locx = node->locx + (node->width + 20.0f) * 2.0f;
@@ -1980,9 +1980,9 @@ static void update_mapping_node_inputs_and_properties(bNodeTree *ntree)
need_update = true;
}
bNode *minimumNode = NULL;
bNode *minimumNode = nullptr;
if (mapping->flag & TEXMAP_CLIP_MAX) {
minimumNode = nodeAddStaticNode(NULL, ntree, SH_NODE_VECTOR_MATH);
minimumNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_VECTOR_MATH);
minimumNode->custom1 = NODE_VECTOR_MATH_MINIMUM;
minimumNode->locx = node->locx + node->width + 20.0f;
minimumNode->locy = node->locy;
@@ -2014,7 +2014,7 @@ static void update_mapping_node_inputs_and_properties(bNodeTree *ntree)
}
MEM_freeN(node->storage);
node->storage = NULL;
node->storage = nullptr;
char node_name_esc[sizeof(node->name) * 2];
BLI_str_escape(node_name_esc, node->name, sizeof(node_name_esc));
@@ -2136,7 +2136,7 @@ static void update_voronoi_node_crackle(bNodeTree *ntree)
{
tex->feature = SHD_VORONOI_F1;
bNode *voronoiNode = nodeAddStaticNode(NULL, ntree, SH_NODE_TEX_VORONOI);
bNode *voronoiNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_TEX_VORONOI);
NodeTexVoronoi *texVoronoi = (NodeTexVoronoi *)voronoiNode->storage;
texVoronoi->feature = SHD_VORONOI_F2;
texVoronoi->distance = tex->distance;
@@ -2176,7 +2176,7 @@ static void update_voronoi_node_crackle(bNodeTree *ntree)
sockVoronoiExponent);
}
bNode *subtractNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
bNode *subtractNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_MATH);
subtractNode->custom1 = NODE_MATH_SUBTRACT;
subtractNode->locx = voronoiNode->locx + voronoiNode->width + 20.0f;
subtractNode->locy = voronoiNode->locy;
@@ -2267,7 +2267,7 @@ static void update_voronoi_node_square_distance(bNodeTree *ntree)
ELEM(tex->feature, SHD_VORONOI_F1, SHD_VORONOI_F2) &&
version_node_socket_is_used(sockDistance))
{
bNode *multiplyNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
bNode *multiplyNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_MATH);
multiplyNode->custom1 = NODE_MATH_MULTIPLY;
multiplyNode->locx = node->locx + node->width + 20.0f;
multiplyNode->locy = node->locy;
@@ -2313,11 +2313,11 @@ static void update_noise_and_wave_distortion(bNodeTree *ntree)
bNodeSocket *sockDistortion = nodeFindSocket(node, SOCK_IN, "Distortion");
float *distortion = version_cycles_node_socket_float_value(sockDistortion);
if (version_node_socket_is_used(sockDistortion) && sockDistortion->link != NULL) {
if (version_node_socket_is_used(sockDistortion) && sockDistortion->link != nullptr) {
bNode *distortionInputNode = sockDistortion->link->fromnode;
bNodeSocket *distortionInputSock = sockDistortion->link->fromsock;
bNode *mulNode = nodeAddStaticNode(NULL, ntree, SH_NODE_MATH);
bNode *mulNode = nodeAddStaticNode(nullptr, ntree, SH_NODE_MATH);
mulNode->custom1 = NODE_MATH_MULTIPLY;
mulNode->locx = node->locx;
mulNode->locy = node->locy - 240.0f;

6
source/blender/blenloader/intern/versioning_common.cc
View File

@@ -354,13 +354,13 @@ float *version_cycles_node_socket_vector_value(bNodeSocket *socket)
IDProperty *version_cycles_properties_from_ID(ID *id)
{
IDProperty *idprop = IDP_GetProperties(id, false);
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles", IDP_GROUP) : NULL;
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles", IDP_GROUP) : nullptr;
}
IDProperty *version_cycles_properties_from_view_layer(ViewLayer *view_layer)
{
IDProperty *idprop = view_layer->id_properties;
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles", IDP_GROUP) : NULL;
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles", IDP_GROUP) : nullptr;
}
float version_cycles_property_float(IDProperty *idprop, const char *name, float default_value)
@@ -401,5 +401,5 @@ void version_cycles_property_boolean_set(IDProperty *idprop, const char *name, b
IDProperty *version_cycles_visibility_properties_from_ID(ID *id)
{
IDProperty *idprop = IDP_GetProperties(id, false);
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles_visibility", IDP_GROUP) : NULL;
return (idprop) ? IDP_GetPropertyTypeFromGroup(idprop, "cycles_visibility", IDP_GROUP) : nullptr;
}

6
source/blender/editors/animation/anim_channels_defines.cc
View File

@@ -4565,7 +4565,7 @@ void ANIM_channel_draw(
GPU_line_width(2.0f);
immBegin(GPU_PRIM_LINES, 2);
immVertex2f(pos, (float)offset, yminc);
immVertex2f(pos, float(offset), yminc);
immVertex2f(pos, (float)v2d->cur.xmax, yminc);
immEnd();
@@ -4672,7 +4672,7 @@ void ANIM_channel_draw(
* - Ends past the space that might be reserved for a scroller.
*/
immRectf(pos,
v2d->cur.xmax - (float)offset,
v2d->cur.xmax - float(offset),
yminc + ymin_ofs,
v2d->cur.xmax + EXTRA_SCROLL_PAD,
ymaxc);
@@ -5590,7 +5590,7 @@ void ANIM_channel_draw_widgets(const bContext *C,
&ptr,
prop,
array_index,
RNA_property_type(prop) == PROP_ENUM ? NULL : "",
RNA_property_type(prop) == PROP_ENUM ? nullptr : "",
ICON_NONE,
offset,
rect->ymin,

2
source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc
View File

@@ -111,7 +111,7 @@ static void GREASE_PENCIL_OT_layer_remove(wmOperatorType *ot)
static const EnumPropertyItem prop_layer_reorder_location[] = {
{LAYER_REORDER_ABOVE, "ABOVE", 0, "Above", ""},
{LAYER_REORDER_BELOW, "BELOW", 0, "Below", ""},
{0, NULL, 0, NULL, NULL},
{0, nullptr, 0, nullptr, nullptr},
};
static int grease_pencil_layer_reorder_exec(bContext *C, wmOperator *op)

2
source/blender/imbuf/intern/anim_movie.cc
View File

@@ -108,7 +108,7 @@ static int an_stringdec(const char *filepath,
ushort num_beg = 0;
ushort num_end = len;
for (short i = (short)len - 1; i >= 0; i--) {
for (short i = short(len) - 1; i >= 0; i--) {
if (filepath[i] == SEP) {
break;
}

11
source/blender/makesrna/intern/rna_grease_pencil.cc
View File

@@ -216,17 +216,20 @@ static void rna_def_grease_pencil_layers_api(BlenderRNA *brna, PropertyRNA *cpro
PropertyRNA *prop;
RNA_def_property_srna(cprop, "GreasePencilv3Layers");
srna = RNA_def_struct(brna, "GreasePencilv3Layers", NULL);
srna = RNA_def_struct(brna, "GreasePencilv3Layers", nullptr);
RNA_def_struct_sdna(srna, "GreasePencil");
RNA_def_struct_ui_text(srna, "Grease Pencil Layers", "Collection of Grease Pencil layers");
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "GreasePencilLayer");
RNA_def_property_pointer_funcs(
prop, "rna_GreasePencil_active_layer_get", "rna_GreasePencil_active_layer_set", NULL, NULL);
RNA_def_property_pointer_funcs(prop,
"rna_GreasePencil_active_layer_get",
"rna_GreasePencil_active_layer_set",
nullptr,
nullptr);
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Active Layer", "Active Grease Pencil layer");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA | NA_SELECTED, NULL);
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA | NA_SELECTED, nullptr);
}
static void rna_def_grease_pencil_layer_group(BlenderRNA *brna)

2
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -12930,7 +12930,7 @@ static void rna_def_node(BlenderRNA *brna)
RNA_def_property_update(prop, NC_NODE | ND_DISPLAY, nullptr);
prop = RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", NODE_MUTED);
RNA_def_property_boolean_sdna(prop, nullptr, "flag", NODE_MUTED);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(prop, "Mute", "");
RNA_def_property_update(prop, 0, "rna_Node_update");

4
source/blender/sequencer/intern/strip_retiming.cc
View File

@@ -257,9 +257,7 @@ SeqRetimingHandle *SEQ_retiming_add_handle(const Scene *scene,
const SeqRetimingHandle *start_handle = SEQ_retiming_find_segment_start_handle(seq, frame_index);
const SeqRetimingHandle *last_handle = SEQ_retiming_last_handle_get(seq);
if (start_handle->strip_frame_index == frame_index ||
last_handle->strip_frame_index == frame_index)
{
if (ELEM(frame_index, start_handle->strip_frame_index, last_handle->strip_frame_index)) {
return nullptr; /* Retiming handle already exists. */
}