[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54297] trunk/blender/source/blender: fix for rangefunc being unused for int & int array.
Campbell Barton
ideasman42 at gmail.com
Mon Feb 4 16:48:29 CET 2013
Revision: 54297
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54297
Author: campbellbarton
Date: 2013-02-04 15:48:29 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
fix for rangefunc being unused for int & int array.
also cast strlen to an int to avoid overflow.
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/intern/colormanagement.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c 2013-02-04 13:50:09 UTC (rev 54296)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c 2013-02-04 15:48:29 UTC (rev 54297)
@@ -2110,7 +2110,7 @@
{
int i, n;
- for (i = strlen(description) - 1; i >= 0; i--) {
+ for (i = (int)strlen(description) - 1; i >= 0; i--) {
if (ELEM(description[i], '\r', '\n')) {
description[i] = '\0';
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_define.c 2013-02-04 13:50:09 UTC (rev 54296)
+++ trunk/blender/source/blender/makesrna/intern/rna_define.c 2013-02-04 15:48:29 UTC (rev 54297)
@@ -2120,6 +2120,7 @@
if (getfunc) iprop->get_ex = getfunc;
if (setfunc) iprop->set_ex = setfunc;
+ if (rangefunc) iprop->range_ex = rangefunc;
if (getfunc || setfunc) {
/* don't save in id properties */
@@ -2136,6 +2137,7 @@
if (getfunc) iprop->getarray_ex = getfunc;
if (setfunc) iprop->setarray_ex = setfunc;
+ if (rangefunc) iprop->range_ex = rangefunc;
if (getfunc || setfunc) {
/* don't save in id properties */
More information about the Bf-blender-cvs
mailing list