blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Proper fix for RNA path evaluation of collection items. 

Following RNA pointer way - only return evaluated item if asked for.
This commit is contained in:
Bastien Montagne 2018-06-28 11:04:07 +02:00
parent 33306cabbe
commit 3f74a5c5fd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4680,7 +4680,7 @@ static bool rna_path_parse(PointerRNA *ptr, const char *path,
/* resolve pointer if further path elements follow
* or explicitly requested
*/
if (eval_pointer || *path) {
if (eval_pointer || *path != '\0') {
PointerRNA nextptr = RNA_property_pointer_get(&curptr, prop);
curptr = nextptr;
@ -4701,8 +4701,7 @@ static bool rna_path_parse(PointerRNA *ptr, const char *path,
return false;
}
/* Only reset current pointer & prop if we still have something to parse, else we lose the result! */
if (path[0] != '\0') {
if (eval_pointer || *path != '\0') {
curptr = nextptr;
prop = NULL; /* now we have a PointerRNA, the prop is our parent so forget it */
index = -1;