Revision: 52504
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52504
Author: campbellbarton
Date: 2012-11-23 06:35:06 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
code cleanup: warning & style
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_camera.cpp
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
Modified: trunk/blender/intern/cycles/blender/blender_camera.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_camera.cpp 2012-11-23
06:09:03 UTC (rev 52503)
+++ trunk/blender/intern/cycles/blender/blender_camera.cpp 2012-11-23
06:35:06 UTC (rev 52504)
@@ -469,7 +469,7 @@
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;
Modified: trunk/blender/source/blender/editors/space_graph/graph_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_buttons.c
2012-11-23 06:09:03 UTC (rev 52503)
+++ trunk/blender/source/blender/editors/space_graph/graph_buttons.c
2012-11-23 06:35:06 UTC (rev 52504)
@@ -715,12 +715,15 @@
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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
