Revision: 37472
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37472
Author: campbellbarton
Date: 2011-06-14 09:41:29 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
fix [#27659] Segfault when adding None to a group
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/bge.logic.rst
trunk/blender/source/blender/makesrna/intern/rna_group.c
Modified: trunk/blender/doc/python_api/rst/bge.logic.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.logic.rst 2011-06-14 07:46:38 UTC
(rev 37471)
+++ trunk/blender/doc/python_api/rst/bge.logic.rst 2011-06-14 09:41:29 UTC
(rev 37472)
@@ -347,7 +347,7 @@
Gets the estimated/average framerate for all the active scenes, not only
the current scene.
- :return: The estimed average framerate in frames per second
+ :return: The estimated average framerate in frames per second
:rtype: float
.. function:: getBlendFileList(path = "//")
Modified: trunk/blender/source/blender/makesrna/intern/rna_group.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_group.c 2011-06-14
07:46:38 UTC (rev 37471)
+++ trunk/blender/source/blender/makesrna/intern/rna_group.c 2011-06-14
09:41:29 UTC (rev 37472)
@@ -95,7 +95,7 @@
RNA_def_function_ui_description(func, "Add this object to a group");
/* object to add */
parm= RNA_def_pointer(func, "object", "Object", "", "Object to add.");
- RNA_def_property_flag(parm, PROP_REQUIRED);
+ RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
/* remove object */
func= RNA_def_function(srna, "unlink", "rna_Group_objects_unlink");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
