Revision: 17257 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17257 Author: blendix Date: 2008-11-01 01:23:08 +0100 (Sat, 01 Nov 2008)
Log Message: ----------- RNA compile error and warning fixes for MSVC. Modified Paths: -------------- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c =================================================================== --- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-11-01 00:17:06 UTC (rev 17256) +++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-11-01 00:23:08 UTC (rev 17257) @@ -510,7 +510,7 @@ } case PROP_BOOLEAN: { BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop; - int i; + unsigned int i; if(bprop->defaultarray) { fprintf(f, "static int rna_%s_%s_default[%d] = {", strct->cname, prop->cname, prop->arraylength); @@ -527,7 +527,7 @@ } case PROP_INT: { IntPropertyRNA *iprop= (IntPropertyRNA*)prop; - int i; + unsigned int i; if(iprop->defaultarray) { fprintf(f, "static int rna_%s_%s_default[%d] = {", strct->cname, prop->cname, prop->arraylength); @@ -544,7 +544,7 @@ } case PROP_FLOAT: { FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop; - int i; + unsigned int i; if(fprop->defaultarray) { fprintf(f, "static float rna_%s_%s_default[%d] = {", strct->cname, prop->cname, prop->arraylength); Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c =================================================================== --- branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c 2008-11-01 00:17:06 UTC (rev 17256) +++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c 2008-11-01 00:23:08 UTC (rev 17257) @@ -383,7 +383,7 @@ internal= MEM_callocN(sizeof(ArrayIterator), "ArrayIterator"); internal->ptr= ptr; - internal->endptr= ptr+length*itemsize; + internal->endptr= ((char*)ptr)+length*itemsize; iter->internal= internal; iter->valid= (internal->ptr != internal->endptr); Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c =================================================================== --- branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c 2008-11-01 00:17:06 UTC (rev 17256) +++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c 2008-11-01 00:23:08 UTC (rev 17257) @@ -272,11 +272,11 @@ fprop= MEM_callocN(sizeof(FloatPropertyRNA), "FloatPropertyRNA"); prop= &fprop->property; - fprop->hardmin= (subtype == PROP_UNSIGNED)? 0: -FLT_MAX; + fprop->hardmin= (subtype == PROP_UNSIGNED)? 0.0f: -FLT_MAX; fprop->hardmax= FLT_MAX; - fprop->softmin= (subtype == PROP_UNSIGNED)? 0: -10000; /* rather arbitrary .. */ - fprop->softmax= 10000; + fprop->softmin= (subtype == PROP_UNSIGNED)? 0.0f: -10000.0f; /* rather arbitrary .. */ + fprop->softmax= 10000.0f; break; } case PROP_STRING: { @@ -421,16 +421,16 @@ IntPropertyRNA *iprop= (IntPropertyRNA*)prop; iprop->hardmin= (int)min; iprop->hardmax= (int)max; - iprop->softmin= MAX2(min, iprop->hardmin); - iprop->softmax= MIN2(max, iprop->hardmax); + iprop->softmin= MAX2((int)min, iprop->hardmin); + iprop->softmax= MIN2((int)max, iprop->hardmax); break; } case PROP_FLOAT: { FloatPropertyRNA *fprop= (FloatPropertyRNA*)prop; fprop->hardmin= (float)min; fprop->hardmax= (float)max; - fprop->softmin= MAX2(min, fprop->hardmin); - fprop->softmax= MIN2(max, fprop->hardmax); + fprop->softmin= MAX2((float)min, fprop->hardmin); + fprop->softmax= MIN2((float)max, fprop->hardmax); break; } default: _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs