diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-12-13 18:06:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-12-13 18:06:02 +0300 |
| commit | f15956356c7706c93152f4267cd1cea24b2c9e30 (patch) | |
| tree | 0b91608e19ce81285823ba8559cfdc118ee220e8 /source/blender/src | |
| parent | 6d6f5bbc1a79c2ed2fb8ce84dd4fc23e4763d926 (diff) | |
misc warning fixes and one fix for a big in curve allocation
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/buttons_object.c | 4 | ||||
| -rw-r--r-- | source/blender/src/language.c | 2 | ||||
| -rw-r--r-- | source/blender/src/poseobject.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 8d29e044142..ae259bf6372 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -3438,7 +3438,7 @@ static void sb_clear_cache(void *ob_v, void *actsoft_v) 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 @@ static void object_softbodies(Object *ob) MEM_freeN(menustr); } - if(psys_cur){ + if(psys_cur && psys){ if(*softflag & OB_SB_ENABLE) val=1; else diff --git a/source/blender/src/language.c b/source/blender/src/language.c index c289d75f88b..5eb4bf3dc61 100644 --- a/source/blender/src/language.c +++ b/source/blender/src/language.c @@ -173,8 +173,8 @@ float BIF_GetStringWidth(BMF_Font* font, char *str, int translate) } void BIF_GetBoundingBox(struct BMF_Font* font, char* str, int translate, rctf *bbox){ - float dummy; #ifdef INTERNATIONAL + float dummy; 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); diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c index 8add5b3dce9..585ff320b71 100644 --- a/source/blender/src/poseobject.c +++ b/source/blender/src/poseobject.c @@ -1154,7 +1154,7 @@ void pose_relax() 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; |