diff options
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index b644aee0c96..447ca07a6ee 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -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, 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; float view_aspect, cam_aspect, sensor_size; diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 67b427daa9c..483348db18e 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -715,12 +715,15 @@ static void graph_panel_drivers(const bContext *C, Panel *pa) uiItemL(row, IFACE_("Value:"), ICON_NONE); if ((dvar->type == DVAR_TYPE_ROT_DIFF) || - (dvar->type == DVAR_TYPE_TRANSFORM_CHAN && - dvar->targets[0].transChan >= DTAR_TRANSCHAN_ROTX && - dvar->targets[0].transChan < DTAR_TRANSCHAN_SCALEX)) + (dvar->type == DVAR_TYPE_TRANSFORM_CHAN && + dvar->targets[0].transChan >= DTAR_TRANSCHAN_ROTX && + dvar->targets[0].transChan < DTAR_TRANSCHAN_SCALEX)) + { BLI_snprintf(valBuf, sizeof(valBuf), "%.3f (%4.1f°)", dvar->curval, RAD2DEGF(dvar->curval)); - else + } + else { BLI_snprintf(valBuf, sizeof(valBuf), "%.3f", dvar->curval); + } uiItemL(row, valBuf, ICON_NONE); } |