[Bf-blender-cvs] [d6ee328] master: Cleanup: style/warnings
Campbell Barton
noreply at git.blender.org
Sun Dec 13 10:02:03 CET 2015
Commit: d6ee328c92ad3c77150a31c51981f2eaeaec1792
Author: Campbell Barton
Date: Sun Dec 13 19:50:59 2015 +1100
Branches: master
https://developer.blender.org/rBd6ee328c92ad3c77150a31c51981f2eaeaec1792
Cleanup: style/warnings
===================================================================
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index ecc78df..48d8b42 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -25,7 +25,7 @@
* Brush based operators for editing Grease Pencil strokes
*/
-/** \file blender/editors/gpencil/gpencil_edit.c
+/** \file blender/editors/gpencil/gpencil_brush.c
* \ingroup edgpencil
*/
@@ -602,10 +602,10 @@ static bool gp_brush_twist_apply(tGP_BrushEditData *gso, bGPDstroke *gps, int i,
#if 0
printf("C: %d %d | P: %d %d -> t: %f %f -> r: %f %f x %f -> %f %f\n",
- gso->mval[0], gso->mval[1], co[0], co[1],
- tco[0], tco[1],
- rco[0], rco[1], angle,
- nco[0], nco[1]);
+ gso->mval[0], gso->mval[1], co[0], co[1],
+ tco[0], tco[1],
+ rco[0], rco[1], angle,
+ nco[0], nco[1]);
#endif
/* convert to dataspace */
@@ -833,7 +833,7 @@ static void gp_brush_clone_add(bContext *C, tGP_BrushEditData *gso)
}
/* Move newly-added strokes around - "Stamp" mode of the Clone brush */
-static void gp_brush_clone_adjust(bContext *C, tGP_BrushEditData *gso)
+static void gp_brush_clone_adjust(tGP_BrushEditData *gso)
{
tGPSB_CloneBrushData *data = gso->customdata;
size_t snum;
@@ -885,7 +885,7 @@ static bool gpsculpt_brush_apply_clone(bContext *C, tGP_BrushEditData *gso)
/* Stamp or Continous Mode */
if (1 /*gso->brush->mode == GP_EDITBRUSH_CLONE_MODE_STAMP*/) {
/* Stamp - Proceed to translate the newly added strokes */
- gp_brush_clone_adjust(C, gso);
+ gp_brush_clone_adjust(gso);
}
else {
/* Continuous - Just keep pasting everytime we move */
@@ -957,7 +957,7 @@ static void gpsculpt_brush_header_set(bContext *C, tGP_BrushEditData *gso)
BLI_snprintf(str, sizeof(str),
IFACE_("GPencil Sculpt: %s Stroke | LMB to paint | RMB/Escape to Exit"
" | Ctrl to Invert Action | Wheel Up/Down for Size "
- " | Shift-Wheel Up/Down for Strength"),
+ " | Shift-Wheel Up/Down for Strength"),
(brush_name) ? brush_name : "<?>");
ED_area_headerprint(CTX_wm_area(C), str);
@@ -1119,7 +1119,7 @@ static void gpsculpt_brush_init_stroke(tGP_BrushEditData *gso)
for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
/* only editable and visible layers are considered */
if ((gpl->flag & (GP_LAYER_HIDE | GP_LAYER_LOCKED)) == 0 &&
- (gpl->actframe != NULL))
+ (gpl->actframe != NULL))
{
bGPDframe *gpf = gpl->actframe;
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 9c832eb..3f1e06f 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -84,7 +84,7 @@ static int gpencil_editmode_toggle_poll(bContext *C)
return ED_gpencil_data_get_active(C) != NULL;
}
-static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
+static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *UNUSED(op))
{
bGPdata *gpd = ED_gpencil_data_get_active(C);
@@ -1020,7 +1020,7 @@ static int gp_snap_poll(bContext *C)
/* --------------------------------- */
-static int gp_snap_to_grid(bContext *C, wmOperator *op)
+static int gp_snap_to_grid(bContext *C, wmOperator *UNUSED(op))
{
RegionView3D *rv3d = CTX_wm_region_data(C);
float gridf = rv3d->gridview;
@@ -1129,7 +1129,7 @@ void GPENCIL_OT_snap_to_cursor(wmOperatorType *ot)
/* ------------------------------- */
-static int gp_snap_cursor_to_sel(bContext *C, wmOperator *op)
+static int gp_snap_cursor_to_sel(bContext *C, wmOperator *UNUSED(op))
{
Scene *scene = CTX_data_scene(C);
View3D *v3d = CTX_wm_view3d(C);
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 74d27fb..79b071e 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1624,8 +1624,8 @@ void BIF_draw_manipulator(const bContext *C)
case V3D_AROUND_ACTIVE:
{
bGPdata *gpd = CTX_data_gpencil_data(C);
- Object *ob = OBACT;
-
+ Object *ob = OBACT;
+
if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) &&
((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) &&
(!(ob->mode & OB_MODE_POSE)))
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 6367b8a..2bce9c2 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -58,7 +58,7 @@ static void rna_GPencil_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Pointe
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
}
-static void rna_GPencil_editmode_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
+static void rna_GPencil_editmode_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
{
/* Notify all places where GPencil data lives that the editing state is different */
WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 94161d9..ed89063 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -985,7 +985,7 @@ static void rna_def_particle_edit(BlenderRNA *brna)
static void rna_def_gpencil_sculpt(BlenderRNA *brna)
{
- static EnumPropertyItem prop_direction_items[]= {
+ static EnumPropertyItem prop_direction_items[] = {
{0, "ADD", 0, "Add", "Add effect of brush"},
{GP_EDITBRUSH_FLAG_INVERT, "SUBTRACT", 0, "Subtract", "Subtract effect of brush"},
{0, NULL, 0, NULL, NULL}};
More information about the Bf-blender-cvs
mailing list