diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 06:34:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 06:34:55 +0400 |
| commit | ac1cb5ee055840ba3481b8ad490e3be2a6a49cf2 (patch) | |
| tree | a24cd7905f6ab5e90d2926b822f9753598198e8f /source/blender/editors/space_view3d | |
| parent | cf40220e54e32cf52931e461b928f26571fc2f4f (diff) | |
- quiet new warnings with gcc 4.6
- use BLI math funcs for normal float/short conversion.
- correct some un-intentional float/double promotions.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_fly.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 4277a7e85e3..b404a7be27c 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -1214,7 +1214,7 @@ static void view3d_panel_object(const bContext *C, Panel *pa) View3D *v3d= CTX_wm_view3d(C); //uiBut *bt; Object *ob= OBACT; - TransformProperties *tfp; + // TransformProperties *tfp; // UNUSED PointerRNA obptr; uiLayout *col, *row; float lim; @@ -1222,12 +1222,13 @@ static void view3d_panel_object(const bContext *C, Panel *pa) if(ob==NULL) return; /* make sure we got storage */ + /* if(v3d->properties_storage==NULL) v3d->properties_storage= MEM_callocN(sizeof(TransformProperties), "TransformProperties"); tfp= v3d->properties_storage; // XXX uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE); - /* + if(ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)) { } else { diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 4914020fc02..7d84a47bddf 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -563,7 +563,8 @@ static int flyApply(bContext *C, FlyInfo *fly) moffset[2], /* mouse offset from the views center */ tmp_quat[4]; /* used for rotating the view */ - int cent_orig[2], /* view center */ + int +// cent_orig[2], /* view center */ //XXX- can avoid using // cent[2], /* view center modified */ xmargin, ymargin; /* x and y margin are define the safe area where the mouses movement wont rotate the view */ unsigned char @@ -582,8 +583,9 @@ static int flyApply(bContext *C, FlyInfo *fly) xmargin= ar->winx/20.0f; ymargin= ar->winy/20.0f; - cent_orig[0]= ar->winrct.xmin + ar->winx/2; - cent_orig[1]= ar->winrct.ymin + ar->winy/2; + // UNUSED + // cent_orig[0]= ar->winrct.xmin + ar->winx/2; + // cent_orig[1]= ar->winrct.ymin + ar->winy/2; { |