[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56167] trunk/blender/source/blender/ editors/interface/interface.c: More fix (cleanup) to r56063: remove call to RNA_create_pointer, it has already been called by uiButGetOperatorPtrRNA() if needed.
Bastien Montagne
montagne29 at wanadoo.fr
Fri Apr 19 15:03:30 CEST 2013
Revision: 56167
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56167
Author: mont29
Date: 2013-04-19 13:03:30 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
More fix (cleanup) to r56063: remove call to RNA_create_pointer, it has already been called by uiButGetOperatorPtrRNA() if needed.
(I thought it would also copy idproperties, but as it does not...).
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56063
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2013-04-19 13:00:21 UTC (rev 56166)
+++ trunk/blender/source/blender/editors/interface/interface.c 2013-04-19 13:03:30 UTC (rev 56167)
@@ -3885,8 +3885,8 @@
}
}
-/* Same parameters as for uiDefSearchBut, with an additional operator pointer, from where to get property to search,
- * operator type, and operator porperties. */
+/* Same parameters as for uiDefSearchBut, with additional operator type and properties, used by callback
+ * to call again the right op with the right options (properties values). */
uiBut *uiDefSearchButO_ptr(uiBlock *block, wmOperatorType *ot, IDProperty *properties,
void *arg, int retval, int icon, int maxlen, int x, int y,
short width, short height, float a1, float a2, const char *tip)
@@ -3901,8 +3901,7 @@
if (properties) {
PointerRNA *ptr = uiButGetOperatorPtrRNA(but);
- /* Copy pointer. */
- RNA_pointer_create(NULL, ot->srna, NULL, ptr);
+ /* Copy idproperties. */
ptr->data = IDP_CopyProperty(properties);
}
More information about the Bf-blender-cvs
mailing list