[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12867] trunk/blender/source/blender: misc warning fixes and one fix for a big in curve allocation
Campbell Barton
ideasman42 at gmail.com
Thu Dec 13 16:06:02 CET 2007
Revision: 12867
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12867
Author: campbellbarton
Date: 2007-12-13 16:06:02 +0100 (Thu, 13 Dec 2007)
Log Message:
-----------
misc warning fixes and one fix for a big in curve allocation
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenlib/BLI_blenlib.h
trunk/blender/source/blender/blenlib/intern/util.c
trunk/blender/source/blender/python/api2_2x/Geometry.c
trunk/blender/source/blender/python/api2_2x/Key.c
trunk/blender/source/blender/python/api2_2x/sceneSequence.c
trunk/blender/source/blender/src/buttons_object.c
trunk/blender/source/blender/src/language.c
trunk/blender/source/blender/src/poseobject.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -1480,7 +1480,7 @@
while(nu) {
if(nu->pntsu<=1) {
- bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList");
+ bl= MEM_callocN(sizeof(BevList)+1*sizeof(BevPoint), "makeBevelList");
BLI_addtail(&(cu->bev), bl);
bl->nr= 0;
} else {
@@ -1490,8 +1490,7 @@
resolu= nu->resolu;
if((nu->type & 7)==CU_POLY) {
-
- len= nu->pntsu;
+
bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList");
BLI_addtail(&(cu->bev), bl);
Modified: trunk/blender/source/blender/blenlib/BLI_blenlib.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_blenlib.h 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/blenlib/BLI_blenlib.h 2007-12-13 15:06:02 UTC (rev 12867)
@@ -368,7 +368,7 @@
char *BLI_strcasestr(const char *s, const char *find);
int BLI_strcasecmp(const char *s1, const char *s2);
int BLI_strncasecmp(const char *s1, const char *s2, int n);
-void BLI_timestr(double time, char *str);
+void BLI_timestr(double _time, char *str); /* time var is global */
/**
* Trick to address 32 GB with an int (only for malloced pointers)
Modified: trunk/blender/source/blender/blenlib/intern/util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/util.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/blenlib/intern/util.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -1621,13 +1621,13 @@
}
#endif // WITH_ICONV
-void BLI_timestr(double time, char *str)
+void BLI_timestr(double _time, char *str)
{
/* format 00:00:00.00 (hr:min:sec) string has to be 12 long */
- int hr= ((int) time) / (60*60);
- int min= ( ((int) time) / 60 ) % 60;
- int sec= ((int) (time)) % 60;
- int hun= ((int) (time * 100.0)) % 100;
+ int hr= ( (int) _time) / (60*60);
+ int min= (((int) _time) / 60 ) % 60;
+ int sec= ( (int) (_time)) % 60;
+ int hun= ( (int) (_time * 100.0)) % 100;
if (hr) {
sprintf(str, "%.2d:%.2d:%.2d.%.2d",hr,min,sec,hun);
Modified: trunk/blender/source/blender/python/api2_2x/Geometry.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Geometry.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/python/api2_2x/Geometry.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -287,7 +287,7 @@
VectorObject *pt, *line_1, *line_2;
float pt_in[3], pt_out[3], l1[3], l2[3];
float lambda;
- PyObject *ret, *val1, *val2;
+ PyObject *ret;
if( !PyArg_ParseTuple ( args, "O!O!O!",
&vector_Type, &pt,
Modified: trunk/blender/source/blender/python/api2_2x/Key.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Key.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/python/api2_2x/Key.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -41,6 +41,7 @@
#include <BKE_main.h>
#include <BKE_curve.h>
#include <BKE_library.h>
+#include <BKE_utildefines.h>
#include "BIF_space.h"
#include "Ipocurve.h"
@@ -60,9 +61,6 @@
#define KEY_TYPE_CURVE 1
#define KEY_TYPE_LATTICE 2
-/* macro from blenkernel/intern/key.c:98 */
-#define GS(a) (*((short *)(a)))
-
static int Key_compare( BPy_Key * a, BPy_Key * b );
static PyObject *Key_repr( BPy_Key * self );
static void Key_dealloc( BPy_Key * self );
Modified: trunk/blender/source/blender/python/api2_2x/sceneSequence.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/sceneSequence.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/python/api2_2x/sceneSequence.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -536,7 +536,7 @@
Strip *strip;
StripElem *se;
int i;
- PyObject *list, *item;
+ PyObject *list;
char *basepath, *name;
if (self->seq->type != SEQ_IMAGE) {
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/src/buttons_object.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -3438,7 +3438,7 @@
static void object_softbodies(Object *ob)
{
SoftBody *sb=ob->soft;
- ParticleSystem *psys;
+ ParticleSystem *psys=NULL;
uiBlock *block;
uiBut *but;
static int val;
@@ -3471,7 +3471,7 @@
MEM_freeN(menustr);
}
- if(psys_cur){
+ if(psys_cur && psys){
if(*softflag & OB_SB_ENABLE)
val=1;
else
Modified: trunk/blender/source/blender/src/language.c
===================================================================
--- trunk/blender/source/blender/src/language.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/src/language.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -173,8 +173,8 @@
}
void BIF_GetBoundingBox(struct BMF_Font* font, char* str, int translate, rctf *bbox){
+#ifdef INTERNATIONAL
float dummy;
-#ifdef INTERNATIONAL
if(G.ui_international == TRUE)
if(translate && (U.transopts & USER_TR_BUTTONS))
FTF_GetBoundingBox(str, &bbox->xmin, &bbox->ymin, &dummy, &bbox->xmax, &bbox->ymax, &dummy, FTF_USE_GETTEXT | FTF_INPUT_UTF8);
Modified: trunk/blender/source/blender/src/poseobject.c
===================================================================
--- trunk/blender/source/blender/src/poseobject.c 2007-12-13 12:50:36 UTC (rev 12866)
+++ trunk/blender/source/blender/src/poseobject.c 2007-12-13 15:06:02 UTC (rev 12867)
@@ -1154,7 +1154,7 @@
int do_loc = 0;
int do_quat = 0;
int flag = 0;*/
- int do_w, do_x, do_y, do_z;
+ int do_x, do_y, do_z;
if (!ob) return;
More information about the Bf-blender-cvs
mailing list