[Bf-blender-cvs] [22e6ae11b46] blender2.8: VGroup search: do not try to search for empty string.

Bastien Montagne noreply at git.blender.org
Tue Nov 27 21:17:35 CET 2018


Commit: 22e6ae11b46cb73640c3f48f7e5353d57d3e040b
Author: Bastien Montagne
Date:   Tue Nov 27 17:26:22 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB22e6ae11b46cb73640c3f48f7e5353d57d3e040b

VGroup search: do not try to search for empty string.

Vgroups always have a non-empty name, this is just loss of time...

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

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

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

diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index bbb7fc4b3bd..e61b8f71ffa 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -479,12 +479,12 @@ void defvert_flip_merged(MDeformVert *dvert, const int *flip_map, const int flip
 
 bDeformGroup *defgroup_find_name(Object *ob, const char *name)
 {
-	return BLI_findstring(&ob->defbase, name, offsetof(bDeformGroup, name));
+	return (name && name[0] != '\0') ? BLI_findstring(&ob->defbase, name, offsetof(bDeformGroup, name)) : NULL;
 }
 
 int defgroup_name_index(Object *ob, const char *name)
 {
-	return (name) ? BLI_findstringindex(&ob->defbase, name, offsetof(bDeformGroup, name)) : -1;
+	return (name && name[0] != '\0') ? BLI_findstringindex(&ob->defbase, name, offsetof(bDeformGroup, name)) : -1;
 }
 
 /**



More information about the Bf-blender-cvs mailing list