[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60089] trunk/blender/source/blender: add back library linking warning when renaming library datablocks in the outliner , also typo corrections.
Campbell Barton
ideasman42 at gmail.com
Fri Sep 13 00:08:57 CEST 2013
Revision: 60089
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60089
Author: campbellbarton
Date: 2013-09-12 22:08:56 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
add back library linking warning when renaming library datablocks in the outliner, also typo corrections.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c 2013-09-12 21:40:08 UTC (rev 60088)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c 2013-09-12 22:08:56 UTC (rev 60089)
@@ -227,7 +227,7 @@
BKE_report(reports, RPT_WARNING, "Cannot edit sequence name");
}
else if (tselem->id->lib) {
- // XXX error_libdata();
+ BKE_report(reports, RPT_WARNING, "Cannot edit external libdata");
}
else if (te->idcode == ID_LI && te->parent) {
BKE_report(reports, RPT_WARNING, "Cannot edit the path of an indirectly linked library");
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2013-09-12 21:40:08 UTC (rev 60088)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2013-09-12 22:08:56 UTC (rev 60089)
@@ -1341,7 +1341,7 @@
return pyrna_py_from_array(ptr, prop);
}
- /* see if we can coorce into a python type - PropertyType */
+ /* see if we can coerce into a python type - PropertyType */
switch (type) {
case PROP_BOOLEAN:
ret = PyBool_FromLong(RNA_property_boolean_get(ptr, prop));
@@ -1507,7 +1507,7 @@
else {
/* Normal Property (not an array) */
- /* see if we can coorce into a python type - PropertyType */
+ /* see if we can coerce into a python type - PropertyType */
switch (type) {
case PROP_BOOLEAN:
{
@@ -4887,7 +4887,7 @@
}
}
else {
- /* see if we can coorce into a python type - PropertyType */
+ /* see if we can coerce into a python type - PropertyType */
switch (type) {
case PROP_BOOLEAN:
ret = PyBool_FromLong(*(int *)data);
More information about the Bf-blender-cvs
mailing list