Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: warning & style

Browse Source
This commit is contained in:
Campbell Barton
2012-11-23 06:35:06 +00:00
parent b688a79b30
commit 8ab5aa6e8d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_camera.cpp
View File

@@ -469,7 +469,7 @@ static void blender_camera_from_view(BlenderCamera *bcam, BL::Scene b_scene, BL:
static void blender_camera_view_subset(BL::Scene b_scene, BL::Object b_ob, BL::SpaceView3D b_v3d, static void blender_camera_view_subset(BL::Scene b_scene, BL::Object b_ob, BL::SpaceView3D b_v3d,
BL::RegionView3D b_rv3d, int width, int height, BoundBox2D *view_box, BoundBox2D *cam_box) BL::RegionView3D b_rv3d, int width, int height, BoundBox2D *view_box, BoundBox2D *cam_box)
{ {
BL::RenderSettings r = b_scene.render(); // BL::RenderSettings r = b_scene.render(); /* UNUSED */
BoundBox2D cam, view; BoundBox2D cam, view;
float view_aspect, cam_aspect, sensor_size; float view_aspect, cam_aspect, sensor_size;

11
source/blender/editors/space_graph/graph_buttons.c
View File

@@ -715,12 +715,15 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
uiItemL(row, IFACE_("Value:"), ICON_NONE); uiItemL(row, IFACE_("Value:"), ICON_NONE);
if ((dvar->type == DVAR_TYPE_ROT_DIFF) || if ((dvar->type == DVAR_TYPE_ROT_DIFF) ||
(dvar->type == DVAR_TYPE_TRANSFORM_CHAN && (dvar->type == DVAR_TYPE_TRANSFORM_CHAN &&
dvar->targets[0].transChan >= DTAR_TRANSCHAN_ROTX && dvar->targets[0].transChan >= DTAR_TRANSCHAN_ROTX &&
dvar->targets[0].transChan < DTAR_TRANSCHAN_SCALEX)) dvar->targets[0].transChan < DTAR_TRANSCHAN_SCALEX))
{
BLI_snprintf(valBuf, sizeof(valBuf), "%.3f (%4.1f°)", dvar->curval, RAD2DEGF(dvar->curval)); BLI_snprintf(valBuf, sizeof(valBuf), "%.3f (%4.1f°)", dvar->curval, RAD2DEGF(dvar->curval));
else }
else {
BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", dvar->curval); BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", dvar->curval);
}
uiItemL(row, valBuf, ICON_NONE); uiItemL(row, valBuf, ICON_NONE);
} }