[Bf-blender-cvs] [e74254dd48c] datablock_idprops: Some minor cleanup.
Bastien Montagne
noreply at git.blender.org
Tue Apr 4 16:23:35 CEST 2017
Commit: e74254dd48c81c29323ea2b2e531e370efb879a7
Author: Bastien Montagne
Date: Tue Apr 4 15:41:39 2017 +0200
Branches: datablock_idprops
https://developer.blender.org/rBe74254dd48c81c29323ea2b2e531e370efb879a7
Some minor cleanup.
===================================================================
M source/blender/makesrna/intern/rna_access.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 6a6ec9d1b14..7ee9cda80ed 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1224,10 +1224,12 @@ int RNA_property_pointer_poll(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *va
PointerPropertyRNA *pprop = (PointerPropertyRNA *)prop;
if (pprop->poll) {
- if (rna_idproperty_check(&prop, ptr))
+ if (rna_idproperty_check(&prop, ptr)) {
return ((PropPointerPollFuncPy) pprop->poll)(ptr, *value, prop);
- else
+ }
+ else {
return pprop->poll(ptr, *value);
+ }
}
return 1;
@@ -2993,8 +2995,9 @@ PointerRNA RNA_property_pointer_get(PointerRNA *ptr, PropertyRNA *prop)
if ((idprop = rna_idproperty_check(&prop, ptr))) {
pprop = (PointerPropertyRNA *)prop;
- if (RNA_struct_is_ID(pprop->type))
+ if (RNA_struct_is_ID(pprop->type)) {
return rna_pointer_inherit_refine(ptr, pprop->type, IDP_Id(idprop));
+ }
/* for groups, data is idprop itself */
if (pprop->typef)
More information about the Bf-blender-cvs
mailing list