[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53513] trunk/blender: add id property clear function ( matching the same python function for dicts/lists)
Campbell Barton
ideasman42 at gmail.com
Thu Jan 3 00:10:19 CET 2013
Revision: 53513
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53513
Author: campbellbarton
Date: 2013-01-02 23:10:14 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
add id property clear function (matching the same python function for dicts/lists)
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/__init__.py
trunk/blender/source/blender/blenkernel/BKE_idprop.h
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/python/generic/idprop_py_api.c
Modified: trunk/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/__init__.py 2013-01-02 22:14:40 UTC (rev 53512)
+++ trunk/blender/intern/cycles/blender/addon/__init__.py 2013-01-02 23:10:14 UTC (rev 53513)
@@ -21,7 +21,7 @@
bl_info = {
"name": "Cycles Render Engine",
"author": "",
- "blender": (2, 6, 5),
+ "blender": (2, 60, 5),
"location": "Info header, render engine menu",
"description": "Cycles Render Engine integration",
"warning": "",
Modified: trunk/blender/source/blender/blenkernel/BKE_idprop.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_idprop.h 2013-01-02 22:14:40 UTC (rev 53512)
+++ trunk/blender/source/blender/blenkernel/BKE_idprop.h 2013-01-02 23:10:14 UTC (rev 53513)
@@ -315,6 +315,8 @@
* the actual struct IDProperty struct either.*/
void IDP_FreeProperty(struct IDProperty *prop);
+void IDP_ClearProperty(IDProperty *prop);
+
/** Unlinks any struct IDProperty<->ID linkage that might be going on.*/
void IDP_UnlinkProperty(struct IDProperty *prop);
Modified: trunk/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/idprop.c 2013-01-02 22:14:40 UTC (rev 53512)
+++ trunk/blender/source/blender/blenkernel/intern/idprop.c 2013-01-02 23:10:14 UTC (rev 53513)
@@ -815,6 +815,13 @@
}
}
+void IDP_ClearProperty(IDProperty *prop)
+{
+ IDP_FreeProperty(prop);
+ prop->data.pointer = NULL;
+ prop->len = prop->totallen = 0;
+}
+
/* Unlinks any IDProperty<->ID linkage that might be going on.
* note: currently unused.*/
void IDP_UnlinkProperty(IDProperty *prop)
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2013-01-02 22:14:40 UTC (rev 53512)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2013-01-02 23:10:14 UTC (rev 53513)
@@ -925,7 +925,7 @@
if (seq->type == SEQ_TYPE_MOVIE) {
seq->flag |= SEQ_FILTERY;
reload_sequence_new_file(scene, seq, FALSE);
- calc_sequence(scene, seq);
+ BKE_sequence_calc(scene, seq);
}
}
Modified: trunk/blender/source/blender/python/generic/idprop_py_api.c
===================================================================
--- trunk/blender/source/blender/python/generic/idprop_py_api.c 2013-01-02 22:14:40 UTC (rev 53512)
+++ trunk/blender/source/blender/python/generic/idprop_py_api.c 2013-01-02 23:10:14 UTC (rev 53513)
@@ -836,6 +836,11 @@
return BPy_IDGroup_MapDataToPy(self->prop);
}
+static PyObject *BPy_IDGroup_clear(BPy_IDProperty *self)
+{
+ IDP_ClearProperty(self->prop);
+ Py_RETURN_NONE;
+}
/* Matches python dict.get(key, [default]) */
static PyObject *BPy_IDGroup_Get(BPy_IDProperty *self, PyObject *args)
@@ -875,6 +880,8 @@
"idprop.get(k[,d]) -> idprop[k] if k in idprop, else d. d defaults to None"},
{"to_dict", (PyCFunction)BPy_IDGroup_to_dict, METH_NOARGS,
"return a purely python version of the group"},
+ {"clear", (PyCFunction)BPy_IDGroup_clear, METH_NOARGS,
+ "clear all members from this group"},
{NULL, NULL, 0, NULL}
};
More information about the Bf-blender-cvs
mailing list