blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Cleanup: style/warnings

This commit is contained in:
Campbell Barton 2015-12-13 19:50:59 +11:00
parent fd5d4cfeff
commit d6ee328c92
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/gpencil/gpencil_brush.c
View File

@ -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;

6
source/blender/editors/gpencil/gpencil_edit.c
View File

@ -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);

4
source/blender/editors/transform/transform_manipulator.c
View File

@ -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)))

2
source/blender/makesrna/intern/rna_gpencil.c
View File

@ -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);

2
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@ -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}};