[Bf-blender-cvs] [b6a795f2858] blender2.8: Small cleanup: Remove uneeded/wrong check

Dalai Felinto noreply at git.blender.org
Fri Oct 26 19:10:19 CEST 2018


Commit: b6a795f28586f436cf01e8a348f998d6b3dfaf4d
Author: Dalai Felinto
Date:   Fri Oct 26 13:45:35 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBb6a795f28586f436cf01e8a348f998d6b3dfaf4d

Small cleanup: Remove uneeded/wrong check

If ob was NULL it would crash in the else part of the if statement.
If we really think we may run into that (which we should not) we can just assert
or add a if (ob == NULL) return; in the top of the function.

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

M	source/blender/blenkernel/intern/object_deform.c

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

diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c
index e051c57ac31..70569bfd51b 100644
--- a/source/blender/blenkernel/intern/object_deform.c
+++ b/source/blender/blenkernel/intern/object_deform.c
@@ -403,7 +403,7 @@ static void object_defgroup_remove_edit_mode(Object *ob, bDeformGroup *dg)
  */
 void BKE_object_defgroup_remove(Object *ob, bDeformGroup *defgroup)
 {
-	if ((ob) && (ob->type == OB_GPENCIL)) {
+	if (ob->type == OB_GPENCIL) {
 		BKE_gpencil_vgroup_remove(ob, defgroup);
 	}
 	else {



More information about the Bf-blender-cvs mailing list