[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51652] trunk/blender: fix [#31661] Custom properties do no respect min/max values
Campbell Barton
ideasman42 at gmail.com
Fri Oct 26 12:54:03 CEST 2012
Revision: 51652
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51652
Author: campbellbarton
Date: 2012-10-26 10:54:02 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
fix [#31661] Custom properties do no respect min/max values
also renamed function added prev commit
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/source/blender/python/BPY_extern.h
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/render/intern/source/external_engine.c
trunk/blender/source/blender/windowmanager/intern/wm.c
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py 2012-10-26 10:33:57 UTC (rev 51651)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py 2012-10-26 10:54:02 UTC (rev 51652)
@@ -1124,9 +1124,15 @@
return prop_new
- property = unique_name(item.keys())
+ prop = unique_name(item.keys())
- item[property] = 1.0
+ item[prop] = 1.0
+
+ # not essential, but without this we get [#31661]
+ prop_ui = rna_idprop_ui_prop_get(item, prop)
+ prop_ui["soft_min"] = prop_ui["min"] = 0.0
+ prop_ui["soft_max"] = prop_ui["max"] = 1.0
+
return {'FINISHED'}
Modified: trunk/blender/source/blender/python/BPY_extern.h
===================================================================
--- trunk/blender/source/blender/python/BPY_extern.h 2012-10-26 10:33:57 UTC (rev 51651)
+++ trunk/blender/source/blender/python/BPY_extern.h 2012-10-26 10:54:02 UTC (rev 51652)
@@ -80,7 +80,7 @@
int BPY_string_exec(struct bContext *C, const char *expr);
void BPY_DECREF(void *pyob_ptr); /* Py_DECREF() */
-void BPY_RNA_DECREF_INVALIDATE(void *pyob_ptr);
+void BPY_DECREF_RNA_INVALIDATE(void *pyob_ptr);
int BPY_context_member_get(struct bContext *C, const char *member, struct bContextDataResult *result);
void BPY_context_set(struct bContext *C);
void BPY_context_update(struct bContext *C);
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2012-10-26 10:33:57 UTC (rev 51651)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2012-10-26 10:54:02 UTC (rev 51652)
@@ -510,7 +510,7 @@
PyGILState_Release(gilstate);
}
-void BPY_RNA_DECREF_INVALIDATE(void *pyob_ptr)
+void BPY_DECREF_RNA_INVALIDATE(void *pyob_ptr)
{
PyGILState_STATE gilstate = PyGILState_Ensure();
const int do_invalidate = (Py_REFCNT((PyObject *)pyob_ptr) > 1);
Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c 2012-10-26 10:33:57 UTC (rev 51651)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c 2012-10-26 10:54:02 UTC (rev 51652)
@@ -138,7 +138,7 @@
{
#ifdef WITH_PYTHON
if (engine->py_instance) {
- BPY_RNA_DECREF_INVALIDATE(engine->py_instance);
+ BPY_DECREF_RNA_INVALIDATE(engine->py_instance);
}
#endif
Modified: trunk/blender/source/blender/windowmanager/intern/wm.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm.c 2012-10-26 10:33:57 UTC (rev 51651)
+++ trunk/blender/source/blender/windowmanager/intern/wm.c 2012-10-26 10:54:02 UTC (rev 51652)
@@ -78,7 +78,7 @@
if (op->py_instance) {
/* do this first in case there are any __del__ functions or
* similar that use properties */
- BPY_RNA_DECREF_INVALIDATE(op->py_instance);
+ BPY_DECREF_RNA_INVALIDATE(op->py_instance);
}
#endif
More information about the Bf-blender-cvs
mailing list