blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

Merge branch 'master' into sculpt-dev

This commit is contained in:
Pablo Dobarro 2020-12-29 16:13:12 +01:00
parent 193806f590 e22a36e80a
commit 52e99c5639
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_access.c
View File

@ -5730,7 +5730,7 @@ static char *rna_idp_path(PointerRNA *ptr,
if (iter->type == IDP_GROUP) {
if (prop->type == PROP_POINTER) {
PointerRNA child_ptr = RNA_property_pointer_get(ptr, prop);
BLI_assert(child_ptr.type != NULL);
BLI_assert(!RNA_pointer_is_null(&child_ptr));
link.name = iter->name;
link.index = -1;
if ((path = rna_idp_path(&child_ptr, iter, needle, &link))) {
@ -5752,7 +5752,7 @@ static char *rna_idp_path(PointerRNA *ptr,
for (j = 0; j < iter->len; j++, array++) {
PointerRNA child_ptr;
if (RNA_property_collection_lookup_int(ptr, prop, j, &child_ptr)) {
BLI_assert(child_ptr.type != NULL);
BLI_assert(!RNA_pointer_is_null(&child_ptr));
link.index = j;
if ((path = rna_idp_path(&child_ptr, array, needle, &link))) {
break;

7
tests/gtests/testing/testing.h
View File

@ -16,6 +16,13 @@ const std::string &flags_test_release_dir(); /* bin/{blender version} in the bui
} // namespace blender::tests
#define EXPECT_V2_NEAR(a, b, eps) \
{ \
EXPECT_NEAR(a[0], b[0], eps); \
EXPECT_NEAR(a[1], b[1], eps); \
} \
(void)0
#define EXPECT_V3_NEAR(a, b, eps) \
{ \
EXPECT_NEAR(a[0], b[0], eps); \