archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: correct assert, remove redundant NULL checks

Browse Source
This commit is contained in:
Campbell Barton
2018-11-28 17:20:23 +11:00
parent ca05985ca7
commit c2863326af
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/intern/gpu_select_pick.c
View File

@@ -86,7 +86,7 @@ static void rect_subregion_stride_calc(const rcti *src, const rcti *dst, SubRect
const int y = dst->ymin - src->ymin;
BLI_assert(src->xmin <= dst->xmin && src->ymin <= dst->ymin &&
src->ymax >= dst->ymax && src->ymax >= dst->ymax);
src->xmax >= dst->xmax && src->ymax >= dst->ymax);
BLI_assert(x >= 0 && y >= 0);
r_sub->start = (uint)((src_x * y) + x);

8
source/blender/nodes/shader/node_shader_tree.c
View File

@@ -641,9 +641,7 @@ static bool ntree_tag_ssr_bsdf_cb(bNode *fromnode, bNode *UNUSED(tonode), void *
if (fromnode->id != NULL) {
bNodeTree *ntree = (bNodeTree *)fromnode->id;
bNode *group_output = ntree_group_output_node(ntree);
if (fromnode) {
ntree_shader_tag_ssr_node(ntree, group_output);
}
ntree_shader_tag_ssr_node(ntree, group_output);
}
break;
case SH_NODE_BSDF_ANISOTROPIC:
@@ -687,9 +685,7 @@ static bool ntree_tag_sss_bsdf_cb(bNode *fromnode, bNode *UNUSED(tonode), void *
if (fromnode->id != NULL) {
bNodeTree *ntree = (bNodeTree *)fromnode->id;
bNode *group_output = ntree_group_output_node(ntree);
if (fromnode) {
ntree_shader_tag_sss_node(ntree, group_output);
}
ntree_shader_tag_sss_node(ntree, group_output);
}
break;
case SH_NODE_BSDF_PRINCIPLED: