Revision: 22428
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22428
Author: aligorith
Date: 2009-08-13 13:54:12 +0200 (Thu, 13 Aug 2009)
Log Message:
-----------
2.5 - Fix for segfaults with entering text in normal number buttons (i.e. frame
buttons in timeline header).
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-08-13 11:14:06 UTC (rev 22427)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-08-13 11:54:12 UTC (rev 22428)
@@ -1505,14 +1505,18 @@
#ifndef DISABLE_PYTHON
{
+ Scene *scene= CTX_data_scene((bContext
*)but->block->evil_C);
char str_unit_convert[256];
- int unit_type=
RNA_SUBTYPE_UNIT_VALUE(RNA_property_subtype(but->rnaprop));
- Scene *scene= CTX_data_scene((bContext
*)but->block->evil_C);
-
-
+ int unit_type;
+
+ if (but->rnaprop)
+
RNA_SUBTYPE_UNIT_VALUE(RNA_property_subtype(but->rnaprop));
+ else
+ unit_type= 0;
+
if(scene->unit.system != USER_UNIT_NONE && unit_type) {
/* ugly, use the draw string to get the value,
this could cause problems if it includes some text which resolves to a unit */
- bUnit_ReplaceString(str_unit_convert, str,
but->drawstr, ui_get_but_scale_unit(but, 1.0), scene->unit.system, unit_type);
+ bUnit_ReplaceString(str_unit_convert, (char
*)str, but->drawstr, ui_get_but_scale_unit(but, 1.0), scene->unit.system,
unit_type);
}
else {
strcpy(str_unit_convert, str);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
