Commit: ddb0a27e0e99bd06a50c971e410845bcb0a84d5a
Author: Julian Eisel
Date: Tue Sep 13 15:30:13 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rBddb0a27e0e99bd06a50c971e410845bcb0a84d5a
Cleanup: Line length, indentation, etc
===================================================================
M source/blender/windowmanager/manipulators/WM_manipulator_api.h
M source/blender/windowmanager/manipulators/WM_manipulator_library.h
M
source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
M
source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
M source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
M source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
M source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
===================================================================
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 6109141..3b4eace 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -52,7 +52,9 @@ struct wmManipulator *WM_manipulator_new(
void (*render_3d_intersection)(const struct bContext *, struct
wmManipulator *, int),
int (*intersect)(struct bContext *, const struct wmEvent *, struct
wmManipulator *),
int (*handler)(struct bContext *, const struct wmEvent *, struct
wmManipulator *, const int));
-void WM_manipulator_delete(ListBase *manipulatorlist, struct wmManipulatorMap
*mmap, struct wmManipulator *manipulator, struct bContext *C);
+void WM_manipulator_delete(
+ ListBase *manipulatorlist, struct wmManipulatorMap *mmap, struct
wmManipulator *manipulator,
+ struct bContext *C);
void WM_manipulator_set_property(struct wmManipulator *, int slot, struct
PointerRNA *ptr, const char *propname);
struct PointerRNA *WM_manipulator_set_operator(struct wmManipulator *, const
char *opname);
@@ -79,7 +81,8 @@ struct wmManipulatorGroupType
*WM_manipulatorgrouptype_append_runtime(
void WM_manipulatorgrouptype_init_runtime(
const struct Main *bmain, struct wmManipulatorMapType *mmaptype,
struct wmManipulatorGroupType *mgrouptype);
-void WM_manipulatorgrouptype_unregister(struct bContext *C, struct Main
*bmain, struct wmManipulatorGroupType *mgroup);
+void WM_manipulatorgrouptype_unregister(
+ struct bContext *C, struct Main *bmain, struct wmManipulatorGroupType
*mgroup);
struct wmKeyMap *WM_manipulatorgroup_keymap_common(
const struct wmManipulatorGroupType *mgrouptype, struct wmKeyConfig
*config);
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_library.h
b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
index 947ca94..1e71069 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_library.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
@@ -85,8 +85,10 @@ enum {
RECT_TRANSFORM_SLOT_SCALE = 1
};
-struct wmManipulator *MANIPULATOR_rect_transform_new(struct wmManipulatorGroup
*mgroup, const char *name, const int style);
-void MANIPULATOR_rect_transform_set_dimensions(struct wmManipulator
*manipulator, const float width, const float height);
+struct wmManipulator *MANIPULATOR_rect_transform_new(
+ struct wmManipulatorGroup *mgroup, const char *name, const int style);
+void MANIPULATOR_rect_transform_set_dimensions(
+ struct wmManipulator *manipulator, const float width, const float
height);
/* -------------------------------------------------------------------- */
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
index d80c36a..7afaa66 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
@@ -247,7 +247,9 @@ static void arrow_draw_intern(ArrowManipulator *arrow,
const bool select, const
}
}
-static void manipulator_arrow_render_3d_intersect(const bContext *UNUSED(C),
wmManipulator *manipulator, int selectionbase)
+static void manipulator_arrow_render_3d_intersect(
+ const bContext *UNUSED(C), wmManipulator *manipulator,
+ int selectionbase)
{
GPU_select_load_id(selectionbase);
arrow_draw_intern((ArrowManipulator *)manipulator, true, false);
@@ -531,7 +533,8 @@ void MANIPULATOR_arrow_set_ui_range(wmManipulator
*manipulator, const float min,
ArrowManipulator *arrow = (ArrowManipulator *)manipulator;
BLI_assert(min < max);
- BLI_assert(!(arrow->manipulator.props[0] && "Make sure this function is
called before WM_manipulator_set_property"));
+ BLI_assert(!(arrow->manipulator.props[0] && "Make sure this function "
+ "is called before WM_manipulator_set_property"));
arrow->data.range = max - min;
arrow->data.min = min;
@@ -547,7 +550,8 @@ void MANIPULATOR_arrow_set_range_fac(wmManipulator
*manipulator, const float ran
{
ArrowManipulator *arrow = (ArrowManipulator *)manipulator;
- BLI_assert(!(arrow->manipulator.props[0] && "Make sure this function is
called before WM_manipulator_set_property"));
+ BLI_assert(!(arrow->manipulator.props[0] && "Make sure this function "
+ "is called before WM_manipulator_set_property"));
arrow->data.range_fac = range_fac;
}
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
index 579b129..b5d9288 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
@@ -186,7 +186,8 @@ static void manipulator_rect_transform_draw(const bContext
*UNUSED(C), wmManipul
r.ymax = half_h;
glPushMatrix();
- glTranslatef(manipulator->origin[0] + manipulator->offset[0],
manipulator->origin[1] + manipulator->offset[1], 0.0f);
+ glTranslatef(manipulator->origin[0] + manipulator->offset[0],
+ manipulator->origin[1] + manipulator->offset[1], 0.0f);
if (cage->style & MANIPULATOR_RECT_TRANSFORM_STYLE_SCALE_UNIFORM)
glScalef(cage->scale[0], cage->scale[0], 1.0);
else
@@ -382,7 +383,9 @@ static int manipulator_rect_transform_invoke(bContext
*UNUSED(C), const wmEvent
return OPERATOR_RUNNING_MODAL;
}
-static int manipulator_rect_transform_handler(bContext *C, const wmEvent
*event, wmManipulator *manipulator, const int UNUSED(flag))
+static int manipulator_rect_transform_handler(
+ bContext *C, const wmEvent *event, wmManipulator *manipulator,
+ const int UNUSED(flag))
{
RectTransformManipulator *cage = (RectTransformManipulator
*)manipulator;
RectTransformInteraction *data = manipulator->interaction_data;
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
index a521db0..fdea67d 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
@@ -62,7 +62,8 @@ BLI_INLINE float manipulator_value_from_offset_constr(
return inverted ? (min + range - (value * range / range_fac)) : (value
* range / range_fac);
}
-float manipulator_offset_from_value(ManipulatorCommonData *data, const float
value, const bool constrained, const bool inverted)
+float manipulator_offset_from_value(
+ ManipulatorCommonData *data, const float value, const bool
constrained, const bool inverted)
{
if (constrained)
return manipulator_offset_from_value_constr(data->range_fac,
data->min, data->range, value, inverted);
@@ -128,7 +129,9 @@ void manipulator_property_data_update(
}
}
-void manipulator_property_value_set(bContext *C, const wmManipulator
*manipulator, const int slot, const float value)
+void manipulator_property_value_set(
+ bContext *C, const wmManipulator *manipulator,
+ const int slot, const float value)
{
PointerRNA ptr = manipulator->ptr[slot];
PropertyRNA *prop = manipulator->props[slot];
@@ -144,7 +147,9 @@ float manipulator_property_value_get(const wmManipulator
*manipulator, const int
return RNA_property_float_get(&manipulator->ptr[slot],
manipulator->props[slot]);
}
-void manipulator_property_value_reset(bContext *C, const wmManipulator
*manipulator, ManipulatorInteraction *inter, const int slot)
+void manipulator_property_value_reset(
+ bContext *C, const wmManipulator *manipulator, ManipulatorInteraction
*inter,
+ const int slot)
{
manipulator_property_value_set(C, manipulator, slot, inter->init_value);
}
diff --git
a/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
b/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
index 7795cd5..b6a19ef 100644
---
a/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
+++
b/source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
@@ -80,7 +80,8 @@ static float verts_plane[4][3] = {
/* -------------------------------------------------------------------- */
-static void manipulator_primitive_draw_geom(const float col_inner[4], const
float col_outer[4], const int style)
+static void manipulator_primitive_draw_geom(
+ const float col_inner[4], const float col_outer[4], const int style)
{
float (*verts)[3];
float vert_count;
@@ -99,7 +100,9 @@ static void manipulator_primitive_draw_geom(const float
col_inner[4], const floa
glDisableClientState(GL_VERTEX_ARRAY);
}
-static void manipulator_primitive_draw_intern(PrimitiveManipulator *prim,
const bool UNUSED(select), const bool highlight)
+static void manipulator_primitive_draw_intern(
+ PrimitiveManipulator *prim, const bool UNUSED(select),
+ const bool highlight)
{
float col_inner[4], col_outer[4];
float rot[3][3];
@@ -156,7 +159,9 @@ static void
manipulator_primitive_draw_intern(PrimitiveManipulator *prim, const
}
}
-static void manipulator_primitive_render_3d_intersect(const bContext
*UNUSED(C), wmManipulator *manipulator, int selectionbase)
+static void manipulator_primitive_render_3d_intersect(
+ const bContext *UNUSED(C), wmManipulator *manipulator,
+ int selectionbase)
{
GPU_select_load_id(selectionbase);
manipulator_primitive_draw_intern((PrimitiveManipulator *)manipulator,
true, false);
@@ -164,10 +169,13 @@ static void
manipulator_primitive_render_3d_intersect(const bContext *UNUSED(C),
static void manipulator_primitive_draw(const bContext *UNUSED(C),
wmManipulator *manipulator)
{
- manipulator_primitive_draw_intern((Pri
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
