code cleanup: warning & style
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Nov 2012 06:35:06 +0000 (06:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Nov 2012 06:35:06 +0000 (06:35 +0000)
intern/cycles/blender/blender_camera.cpp
source/blender/editors/space_graph/graph_buttons.c

index b644aee0c9600dcab3bd51d4d3c190d9a036a86f..447ca07a6eee5c90a167fa006fc6ee305426152c 100644 (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,
        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;
 
index 67b427daa9cc1e4a896c5c9d064046e40d33d155..483348db18e4ab7ce747a8273fd8ca21992229eb 100644 (file)
@@ -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);
                }