add RNA_property_is_set function, use for WM_menu_invoke to avoid double lookup and...

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 7e8ea11a940c52c0994cacca49b7993cfb2ace26..9c8cd831d7282bdef5a51872cf3cb27ae2024f21 100644 (file)
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -933,7 +933,8 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name);
        }
 
 /* check if the idproperty exists, for operators */
-int RNA_struct_property_is_set(PointerRNA *ptr, const char *name);
+int RNA_property_is_set(PointerRNA *ptr, PropertyRNA *prop);
+int RNA_struct_property_is_set(PointerRNA *ptr, const char *identifier);
 int RNA_property_is_idprop(PropertyRNA *prop);
 
 /* python compatible string representation of this property, (must be freed!) */

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 41641af6514f2623d19fe431eb1e7652c63a15f3..ddd0fa1434c4a6e71a6a7889b07c520f3a97f992 100644 (file)
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -4412,15 +4412,22 @@ int RNA_collection_length(PointerRNA *ptr, const char *name)
        }
 }
 
-int RNA_struct_property_is_set(PointerRNA *ptr, const char *name)
+int RNA_property_is_set(PointerRNA *ptr, PropertyRNA *prop)
 {
-       PropertyRNA *prop= RNA_struct_find_property(ptr, name);
+       if(prop->flag & PROP_IDPROPERTY) {
+               return (rna_idproperty_find(ptr, prop->identifier) != NULL);
+       }
+       else {
+               return 1;
+       }
+}
+
+int RNA_struct_property_is_set(PointerRNA *ptr, const char *identifier)
+{
+       PropertyRNA *prop= RNA_struct_find_property(ptr, identifier);
 
        if(prop) {
-               if(prop->flag & PROP_IDPROPERTY)
-                       return (rna_idproperty_find(ptr, name) != NULL);
-               else
-                       return 1;
+               return RNA_property_is_set(ptr, prop);
        }
        else {
                /* python raises an error */

diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index a54e65011e6d47f37edfbcc57512f0272240d05d..588f08224c892a57a24710a74be9de0f4929e69e 100644 (file)
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -3055,7 +3055,6 @@ static PyObject *pyrna_struct_is_property_set(BPy_StructRNA *self, PyObject *arg
 {
        PropertyRNA *prop;
        const char *name;
-       int ret;
 
        PYRNA_STRUCT_CHECK_OBJ(self);
 
@@ -3069,22 +3068,7 @@ static PyObject *pyrna_struct_is_property_set(BPy_StructRNA *self, PyObject *arg
                return NULL;
        }
 
-       /* double property lookup, could speed up */
-       /* return PyBool_FromLong(RNA_struct_property_is_set(&self->ptr, name)); */
-       if (RNA_property_flag(prop) & PROP_IDPROPERTY) {
-               IDProperty *group = RNA_struct_idprops(&self->ptr, 0);
-               if (group) {
-                       ret = IDP_GetPropertyFromGroup(group, name) ? 1:0;
-               }
-               else {
-                       ret = 0;
-               }
-       }
-       else {
-               ret = 1;
-       }
-
-       return PyBool_FromLong(ret);
+       return PyBool_FromLong(RNA_property_is_set(&self->ptr, prop));
 }
 
 PyDoc_STRVAR(pyrna_struct_is_property_hidden_doc,

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 19050208265d209f3593cf640ce86ceee838be85..c917031708d86cd8354f831fde93333c3d37a474 100644 (file)
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -665,7 +665,7 @@ int WM_menu_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
                printf("%s: %s \"%s\" is not an enum property\n",
                       __func__, op->type->idname, RNA_property_identifier(prop));
        }
-       else if (RNA_struct_property_is_set(op->ptr, RNA_property_identifier(prop))) {
+       else if (RNA_property_is_set(op->ptr, prop)) {
                const int retval= op->type->exec(C, op);
                OPERATOR_RETVAL_CHECK(retval);
                return retval;