[Bf-blender-cvs] [c2863326afd] blender2.8: Cleanup: correct assert, remove redundant NULL checks

[Campbell Barton]

Commit: c2863326afd41e3b07b44f27177e7f7b0692dab4
Author: Campbell Barton
Date:   Wed Nov 28 17:20:23 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBc2863326afd41e3b07b44f27177e7f7b0692dab4

Cleanup: correct assert, remove redundant NULL checks

===================================================================

M	source/blender/gpu/intern/gpu_select_pick.c
M	source/blender/nodes/shader/node_shader_tree.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_select_pick.c b/source/blender/gpu/intern/gpu_select_pick.c
index fecac55087f..9b64d48fe50 100644
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@ -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);
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c
index 2c69da2d9cd..7fe5b7df37d 100644
--- a/source/blender/nodes/shader/node_shader_tree.c
+++ b/source/blender/nodes/shader/node_shader_tree.c
@@ -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: