Commit: 54369a553502f89de2de03d7621e7a6580319c3e
Author: Julian Eisel
Date: Fri May 8 23:55:17 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB54369a553502f89de2de03d7621e7a6580319c3e
Cleanup: Whitespace, Warnings, etc.
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/transform/manipulator_widget.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c
b/source/blender/editors/space_sequencer/sequencer_draw.c
index 0f558fc..4f9c770 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1302,8 +1302,8 @@ void draw_image_seq(const bContext *C, Scene *scene,
ARegion *ar, SpaceSeq *sseq
else if (draw_overdrop) {
float imagex = (scene->r.size * scene->r.xsch) / 200.0f *
sseq->overdrop_zoom;
float imagey = (scene->r.size * scene->r.ysch) / 200.0f *
sseq->overdrop_zoom;
- float xofs = BLI_rcti_size_x(&ar->winrct)/2.0f +
sseq->overdrop_offset[0];
- float yofs = BLI_rcti_size_y(&ar->winrct)/2.0f +
sseq->overdrop_offset[1];
+ float xofs = BLI_rcti_size_x(&ar->winrct) / 2.0f +
sseq->overdrop_offset[0];
+ float yofs = BLI_rcti_size_y(&ar->winrct) / 2.0f +
sseq->overdrop_offset[1];
glTexCoord2f(0.0f, 0.0f); glVertex2f(-imagex + xofs, -imagey +
yofs);
glTexCoord2f(0.0f, 1.0f); glVertex2f(-imagex + xofs, imagey +
yofs);
diff --git a/source/blender/editors/transform/manipulator_widget.c
b/source/blender/editors/transform/manipulator_widget.c
index c9dd765..8f5dd54 100644
--- a/source/blender/editors/transform/manipulator_widget.c
+++ b/source/blender/editors/transform/manipulator_widget.c
@@ -153,16 +153,18 @@ enum {
/* loop over axes of given type */
#define MAN_ITER_AXES_BEGIN(axis_type) \
- for (i = (axis_type == MAN_AXES_ROTATE ? 3 : 0); \
- i < (axis_type == MAN_AXES_TRANSLATE ? 3 : 6 ); \
- i++) { \
+ for (i = (axis_type == MAN_AXES_ROTATE ? MAN_AXIS_ROT_X :
MAN_AXIS_TRANS_X); \
+ i < (axis_type == MAN_AXES_TRANSLATE ? MAN_AXIS_TRANS_Z + 1 :
MAN_AXIS_ROT_Z + 1); \
+ i++) \
+ { \
axis = manipulator_get_axis_from_index(manipulator, i);
-#define MAN_ITER_AXES_END }
+#define MAN_ITER_AXES_END \
+ } (void)0
static wmWidget *manipulator_get_axis_from_index(const ManipulatorGroup
*manipulator, const short index)
{
- wmWidget *axis;
+ wmWidget *axis = NULL;
BLI_assert(IN_RANGE_INCL(index, 0.0f, 5.0f));
@@ -2020,7 +2022,7 @@ static void WIDGETGROUP_manipulator_create(const struct
bContext *UNUSED(C), str
}
axis->render_3d_intersection = widget->render_3d_intersection;
/* XXX overides arrow/dial intersection */
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
WM_widgetgroup_customdata_set(wgroup, manipulator);
}
@@ -2049,7 +2051,7 @@ void WIDGETGROUP_manipulator_update(const struct bContext
*C, struct wmWidgetGro
{
WM_widget_flag_enable(axis, WM_WIDGET_HIDDEN);
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
return;
}
@@ -2089,7 +2091,7 @@ void WIDGETGROUP_manipulator_update(const struct bContext
*C, struct wmWidgetGro
{
WM_widget_flag_enable(axis, WM_WIDGET_HIDDEN);
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
return;
}
@@ -2101,12 +2103,12 @@ void WIDGETGROUP_manipulator_update(const struct
bContext *C, struct wmWidgetGro
{
WM_widget_operator(axis, "TRANSFORM_OT_translate");
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
MAN_ITER_AXES_BEGIN(MAN_AXES_ROTATE)
{
WM_widget_operator(axis, "TRANSFORM_OT_rotate");
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
if (v3d->twtype & V3D_MANIP_TRANSLATE) {
MAN_ITER_AXES_BEGIN(MAN_AXES_TRANSLATE)
@@ -2117,14 +2119,14 @@ void WIDGETGROUP_manipulator_update(const struct
bContext *C, struct wmWidgetGro
WM_widget_flag_disable(axis, WM_WIDGET_HIDDEN);
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
}
else {
MAN_ITER_AXES_BEGIN(MAN_AXES_TRANSLATE)
{
WM_widget_flag_enable(axis, WM_WIDGET_HIDDEN);
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
}
if (v3d->twtype & V3D_MANIP_ROTATE) {
@@ -2136,14 +2138,14 @@ void WIDGETGROUP_manipulator_update(const struct
bContext *C, struct wmWidgetGro
WM_widget_flag_disable(axis, WM_WIDGET_HIDDEN);
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
}
else {
MAN_ITER_AXES_BEGIN(MAN_AXES_ROTATE)
{
WM_widget_flag_enable(axis, WM_WIDGET_HIDDEN);
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
}
}
@@ -2184,5 +2186,5 @@ void WIDGETGROUP_object_manipulator_draw(const struct
bContext *C, struct wmWidg
WIDGET_arrow_set_direction(axis, rv3d->twmat[i]);
WM_widget_flag_disable(axis, WM_WIDGET_HIDDEN);
}
- MAN_ITER_AXES_END
+ MAN_ITER_AXES_END;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
