diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 17:09:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 17:09:14 +0400 |
commit | e84c0980a3afb89301f8512acee64e525db3a49d (patch) | |
tree | 8700c1b43e1887ad8916c623b1f5066bc6b6f17f /source/blender/editors | |
parent | 094c9799f9926ae37515a1fe0380403ce3298a77 (diff) |
correct indentation and some whitespace edits (no functional changes)
Diffstat (limited to 'source/blender/editors')
28 files changed, 121 insertions, 108 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 7376b2e804c..caffdc29118 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -4108,7 +4108,7 @@ void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) /* props */ RNA_def_enum(ot->srna, "direction", direction_items, - BONE_SELECT_PARENT, "Direction", ""); + BONE_SELECT_PARENT, "Direction", ""); RNA_def_boolean(ot->srna, "extend", 0, "Add to Selection", ""); } @@ -5207,9 +5207,9 @@ static int pose_hide_exec(bContext *C, wmOperator *op) bArmature *arm= ob->data; if(RNA_boolean_get(op->ptr, "unselected")) - bone_looper(ob, arm->bonebase.first, NULL, hide_unselected_pose_bone_cb); + bone_looper(ob, arm->bonebase.first, NULL, hide_unselected_pose_bone_cb); else - bone_looper(ob, arm->bonebase.first, NULL, hide_selected_pose_bone_cb); + bone_looper(ob, arm->bonebase.first, NULL, hide_selected_pose_bone_cb); /* note, notifier might evolve */ WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, ob); diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index ccc375a03f9..451e672da7c 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -2287,8 +2287,8 @@ static void retargetArctoArcAggresive(bContext *C, RigGraph *rigg, RigArc *iarc, /* set joints to best position */ for (edge = iarc->edges.first, i = 0; - edge; - edge = edge->next, i++) + edge; + edge = edge->next, i++) { float *no = NULL; if (i < nb_joints) diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index 2557c7f7c72..59b3f483b38 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -42,7 +42,7 @@ extern const char ED_lorem[]; enum { DEL_ALL, DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL }; enum { CASE_LOWER, CASE_UPPER }; enum { LINE_BEGIN, LINE_END, PREV_CHAR, NEXT_CHAR, PREV_WORD, NEXT_WORD, - PREV_LINE, NEXT_LINE, PREV_PAGE, NEXT_PAGE }; + PREV_LINE, NEXT_LINE, PREV_PAGE, NEXT_PAGE }; void FONT_OT_text_insert(struct wmOperatorType *ot); void FONT_OT_line_break(struct wmOperatorType *ot); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 0556291c197..1f6673137a1 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -688,8 +688,8 @@ static void key_to_bezt(float *key, BezTriple *basebezt, BezTriple *bezt) static void bezt_to_key(BezTriple *bezt, float *key) { - memcpy(key, bezt->vec, sizeof(float) * 9); - key[9] = bezt->alfa; + memcpy(key, bezt->vec, sizeof(float) * 9); + key[9] = bezt->alfa; } static void calc_keyHandles(ListBase *nurb, float *key) diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h index 7993e11ea55..bd746e36ef4 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.h @@ -40,7 +40,7 @@ struct wmWindowManager; /* sculpt.c */ void ED_operatortypes_sculpt(void); void sculpt_get_redraw_planes(float planes[4][4], struct ARegion *ar, - struct RegionView3D *rv3d, struct Object *ob); + struct RegionView3D *rv3d, struct Object *ob); void ED_sculpt_force_update(struct bContext *C); /* paint_ops.c */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index cd5fee139ee..35fabb3b80e 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -727,7 +727,7 @@ void uiTemplateDopeSheetFilter(uiLayout *layout, struct bContext *C, struct Poin void uiTemplateID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, const char *newop, const char *openop, const char *unlinkop); void uiTemplateIDBrowse(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, - const char *newop, const char *openop, const char *unlinkop); + const char *newop, const char *openop, const char *unlinkop); void uiTemplateIDPreview(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, const char *newop, const char *openop, const char *unlinkop, int rows, int cols); void uiTemplateAnyID(uiLayout *layout, struct PointerRNA *ptr, const char *propname, @@ -744,7 +744,7 @@ void uiTemplateVectorscope(uiLayout *layout, struct PointerRNA *ptr, const char void uiTemplateCurveMapping(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int type, int levels, int brush); void uiTemplateColorWheel(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int value_slider, int lock, int lock_luminosity, int cubic); void uiTemplateLayers(uiLayout *layout, struct PointerRNA *ptr, const char *propname, - PointerRNA *used_ptr, const char *used_propname, int active_layer); + PointerRNA *used_ptr, const char *used_propname, int active_layer); void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *userptr, int compact); void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser); void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C); diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index fab983cee43..81b42277055 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -274,7 +274,7 @@ void ui_bounds_block(uiBlock *block) if(bt->x1 < block->minx) block->minx= bt->x1; if(bt->y1 < block->miny) block->miny= bt->y1; - if(bt->x2 > block->maxx) block->maxx= bt->x2; + if(bt->x2 > block->maxx) block->maxx= bt->x2; if(bt->y2 > block->maxy) block->maxy= bt->y2; bt= bt->next; @@ -363,7 +363,7 @@ static void ui_popup_bounds_block(const bContext *C, uiBlock *block, int bounds_ oldheight= oldheight > 0 ? oldheight : MAX2(1, height); /* offset block based on mouse position, user offset is scaled - along in case we resized the block in ui_text_bounds_block */ + * along in case we resized the block in ui_text_bounds_block */ startx= window->eventstate->x + block->minx + (block->mx*width)/oldwidth; starty= window->eventstate->y + block->miny + (block->my*height)/oldheight; @@ -633,7 +633,7 @@ static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut } /* copy hardmin for list rows to prevent 'sticking' highlight to mouse position - when scrolling without moving mouse (see [#28432]) */ + * when scrolling without moving mouse (see [#28432]) */ if(ELEM(oldbut->type, ROW, LISTROW)) oldbut->hardmax= but->hardmax; @@ -659,7 +659,7 @@ static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut } /* needed for temporarily rename buttons, such as in outliner or fileselect, - they should keep calling uiDefButs to keep them alive */ + * they should keep calling uiDefButs to keep them alive */ /* returns 0 when button removed */ int uiButActiveOnly(const bContext *C, uiBlock *block, uiBut *but) { @@ -1890,8 +1890,8 @@ static void ui_free_but(const bContext *C, uiBut *but) if(but->func_argN) MEM_freeN(but->func_argN); if(but->active) { /* XXX solve later, buttons should be free-able without context ideally, - however they may have open tooltips or popup windows, which need to - be closed using a context pointer */ + * however they may have open tooltips or popup windows, which need to + * be closed using a context pointer */ if(C) ui_button_active_free(C, but); else @@ -2424,14 +2424,13 @@ void ui_block_do_align(uiBlock *block) } /* -ui_def_but is the function that draws many button types + * ui_def_but is the function that draws many button types -for float buttons: - "a1" Click Step (how much to change the value each click) - "a2" Number of decimal point values to display. 0 defaults to 3 (0.000) 1,2,3, and a maximum of 4, - all greater values will be clamped to 4. - -*/ + * for float buttons: + * "a1" Click Step (how much to change the value each click) + * "a2" Number of decimal point values to display. 0 defaults to 3 (0.000) + * 1,2,3, and a maximum of 4, all greater values will be clamped to 4. + */ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { uiBut *but; diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 67030f1aca7..1ed05bc54f0 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1326,9 +1326,9 @@ static void ui_draw_but_curve_grid(rcti *rect, float zoomx, float zoomy, float o static void glColor3ubvShade(unsigned char *col, int shade) { - glColor3ub(col[0]-shade>0?col[0]-shade:0, - col[1]-shade>0?col[1]-shade:0, - col[2]-shade>0?col[2]-shade:0); + glColor3ub(col[0]-shade>0?col[0]-shade:0, + col[1]-shade>0?col[1]-shade:0, + col[2]-shade>0?col[2]-shade:0); } void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *rect) diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c index 0c0163d0f24..845cc29c91b 100644 --- a/source/blender/editors/mesh/editmesh_lib.c +++ b/source/blender/editors/mesh/editmesh_lib.c @@ -525,9 +525,9 @@ void EM_set_flag_all(EditMesh *em, int flag) void EM_set_flag_all_selectmode(EditMesh *em, int flag) { - EditVert *eve; - EditEdge *eed; - EditFace *efa; + EditVert *eve; + EditEdge *eed; + EditFace *efa; int selvert= 0, seledge= 0, selface= 0; diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index b4bee60e415..3e4051cc751 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -1312,7 +1312,7 @@ void MESH_OT_select_similar(wmOperatorType *ot) int mesh_layers_menu_charlen(CustomData *data, int type) { - int i, len = 0; + int i, len = 0; /* see if there is a duplicate */ for(i=0; i<data->totlayer; i++) { if((&data->layers[i])->type == type) { diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 1852d90eed0..4ac418fdd9a 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -1651,7 +1651,7 @@ static void fill_quad_single(EditMesh *em, EditFace *efa, struct GHash *gh, int facecopy(em, efa,hold); if(i+1 != (vertsize-1)/2) { if(seltype == SUBDIV_SELECT_INNER) { - hold->e3->f2 |= EDGEINNER; + hold->e3->f2 |= EDGEINNER; } } } @@ -1720,7 +1720,7 @@ static void fill_tri_single(EditMesh *em, EditFace *efa, struct GHash *gh, int n hold = addfacelist(em, verts[i],verts[i+1],v[op],NULL,NULL,NULL); if(i+1 != vertsize-1) { if(seltype == SUBDIV_SELECT_INNER) { - hold->e2->f2 |= EDGEINNER; + hold->e2->f2 |= EDGEINNER; } } facecopy(em, efa,hold); @@ -2369,7 +2369,7 @@ static void fill_quad_quadruple(EditMesh *em, EditFace *efa, struct GHash *gh, i } // Clean up our dynamic multi-dim array for(i=0;i<numcuts+2;i++) { - MEM_freeN(innerverts[i]); + MEM_freeN(innerverts[i]); } MEM_freeN(innerverts); } diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 9164dc7d4c8..46076d0bec4 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -282,7 +282,7 @@ int ED_mesh_color_remove(bContext *C, Object *ob, Mesh *me) CustomDataLayer *cdl; int index; - index= CustomData_get_active_layer_index(data, CD_MCOL); + index= CustomData_get_active_layer_index(data, CD_MCOL); cdl= (index == -1)? NULL: &data->layers[index]; if(!cdl) @@ -301,7 +301,7 @@ int ED_mesh_color_remove_named(bContext *C, Object *ob, Mesh *me, const char *na CustomDataLayer *cdl; int index; - index= CustomData_get_named_layer_index(data, CD_MCOL, name); + index= CustomData_get_named_layer_index(data, CD_MCOL, name); cdl= (index == -1)? NULL: &data->layers[index]; if(!cdl) diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 4fbb5e0d51c..88182a31056 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -475,7 +475,7 @@ void ED_object_enter_editmode(bContext *C, int flag) else if(ob->type==OB_FONT) { scene->obedit= ob; // XXX for context ok= 1; - make_editText(ob); + make_editText(ob); WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_EDITMODE_TEXT, scene); } @@ -536,9 +536,9 @@ static int editmode_toggle_poll(bContext *C) return 0; return (ob->type == OB_MESH || ob->type == OB_ARMATURE || - ob->type == OB_FONT || ob->type == OB_MBALL || - ob->type == OB_LATTICE || ob->type == OB_SURF || - ob->type == OB_CURVE); + ob->type == OB_FONT || ob->type == OB_MBALL || + ob->type == OB_LATTICE || ob->type == OB_SURF || + ob->type == OB_CURVE); } void OBJECT_OT_editmode_toggle(wmOperatorType *ot) diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 5bb1b634fe0..2a827091fde 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -465,8 +465,8 @@ static void add_hook_object(Main *bmain, Scene *scene, Object *obedit, Object *o invert_m4_m4(ob->imat, ob->obmat); /* apparently this call goes from right to left... */ - mul_serie_m4(hmd->parentinv, ob->imat, obedit->obmat, NULL, - NULL, NULL, NULL, NULL, NULL); + mul_serie_m4(hmd->parentinv, ob->imat, obedit->obmat, NULL, + NULL, NULL, NULL, NULL, NULL); DAG_scene_sort(bmain, scene); } diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index d10a6be1988..fce37b7a022 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -296,8 +296,8 @@ static int object_select_linked_exec(bContext *C, wmOperator *op) } else if(nr==5) { if(base->object->dup_group==ob->dup_group) { - base->flag |= SELECT; - changed = 1; + base->flag |= SELECT; + changed = 1; } } else if(nr==6) { diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 767001ff163..0e65383861b 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -423,15 +423,15 @@ static void paint_draw_alpha_overlay(Sculpt *sd, Brush *brush, /* save lots of GL state TODO: check on whether all of these are needed? */ glPushAttrib(GL_COLOR_BUFFER_BIT| - GL_CURRENT_BIT| - GL_DEPTH_BUFFER_BIT| - GL_ENABLE_BIT| - GL_LINE_BIT| - GL_POLYGON_BIT| - GL_STENCIL_BUFFER_BIT| - GL_TRANSFORM_BIT| - GL_VIEWPORT_BIT| - GL_TEXTURE_BIT); + GL_CURRENT_BIT| + GL_DEPTH_BUFFER_BIT| + GL_ENABLE_BIT| + GL_LINE_BIT| + GL_POLYGON_BIT| + GL_STENCIL_BUFFER_BIT| + GL_TRANSFORM_BIT| + GL_VIEWPORT_BIT| + GL_TEXTURE_BIT); if(load_tex(sd, brush, vc)) { glEnable(GL_BLEND); @@ -484,9 +484,9 @@ static void paint_draw_alpha_overlay(Sculpt *sd, Brush *brush, /* set quad color */ glColor4f(U.sculpt_paint_overlay_col[0], - U.sculpt_paint_overlay_col[1], - U.sculpt_paint_overlay_col[2], - brush->texture_overlay_alpha / 100.0f); + U.sculpt_paint_overlay_col[1], + U.sculpt_paint_overlay_col[2], + brush->texture_overlay_alpha / 100.0f); /* draw textured quad */ glBegin(GL_QUADS); @@ -619,7 +619,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) visual_strength = 1; outline_alpha = ((paint->flags & PAINT_SHOW_BRUSH_ON_SURFACE) ? - min_alpha + (visual_strength*(max_alpha-min_alpha)) : 0.50f); + min_alpha + (visual_strength*(max_alpha-min_alpha)) : 0.50f); if(sd->draw_anchored) { final_radius = sd->anchored_size; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index ac2efcb2ec2..a63a9256055 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -2450,7 +2450,7 @@ static void sculpt_combine_proxies(Sculpt *sd, Object *ob) if(!ELEM(brush->sculpt_tool, SCULPT_TOOL_SMOOTH, SCULPT_TOOL_LAYER)) { /* these brushes start from original coordinates */ const int use_orco = (ELEM3(brush->sculpt_tool, SCULPT_TOOL_GRAB, - SCULPT_TOOL_ROTATE, SCULPT_TOOL_THUMB)); + SCULPT_TOOL_ROTATE, SCULPT_TOOL_THUMB)); #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (n= 0; n < totnode; n++) { @@ -2972,7 +2972,7 @@ static void sculpt_update_brush_delta(Sculpt *sd, Object *ob, Brush *brush) if(cache->first_time) { copy_v3_v3(cache->orig_grab_location, - cache->true_location); + cache->true_location); } else if(tool == SCULPT_TOOL_SNAKE_HOOK) add_v3_v3(cache->true_location, cache->grab_delta); @@ -3246,7 +3246,7 @@ int sculpt_stroke_get_location(bContext *C, struct PaintStroke *stroke, float ou srd.hit = 0; srd.original = (cache)? cache->original: 0; BLI_pbvh_raycast(ss->pbvh, sculpt_raycast_cb, &srd, - ray_start, ray_normal, srd.original); + ray_start, ray_normal, srd.original); copy_v3_v3(out, ray_normal); mul_v3_fl(out, srd.dist); @@ -3506,9 +3506,9 @@ static int sculpt_brush_stroke_invoke(bContext *C, wmOperator *op, wmEvent *even return OPERATOR_CANCELLED; stroke = paint_stroke_new(C, sculpt_stroke_get_location, - sculpt_stroke_test_start, - sculpt_stroke_update_step, - sculpt_stroke_done, event->type); + sculpt_stroke_test_start, + sculpt_stroke_update_step, + sculpt_stroke_done, event->type); op->customdata = stroke; diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index d91282e768f..41aae64445a 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -177,17 +177,17 @@ void file_draw_buttons(const bContext *C, ARegion *ar) uiBlockSetFunc(block, file_draw_check_cb, NULL, NULL); but = uiDefButTextO(block, TEX, "FILE_OT_directory", 0, "", - min_x, line1_y, line1_w-chan_offs, btn_h, - params->dir, 0.0, (float)FILE_MAX, 0, 0, - TIP_("File path")); + min_x, line1_y, line1_w-chan_offs, btn_h, + params->dir, 0.0, (float)FILE_MAX, 0, 0, + TIP_("File path")); uiButSetCompleteFunc(but, autocomplete_directory, NULL); uiButSetFlag(but, UI_BUT_NO_UTF8); if((params->flag & FILE_DIRSEL_ONLY) == 0) { but = uiDefBut(block, TEX, B_FS_FILENAME, "", - min_x, line2_y, line2_w-chan_offs, btn_h, - params->file, 0.0, (float)FILE_MAXFILE, 0, 0, - TIP_(overwrite_alert ?N_("File name, overwrite existing") : N_("File name"))); + min_x, line2_y, line2_w-chan_offs, btn_h, + params->file, 0.0, (float)FILE_MAXFILE, 0, 0, + TIP_(overwrite_alert ?N_("File name, overwrite existing") : N_("File name"))); uiButSetCompleteFunc(but, autocomplete_file, NULL); uiButSetFlag(but, UI_BUT_NO_UTF8); @@ -205,16 +205,16 @@ void file_draw_buttons(const bContext *C, ARegion *ar) if (fnumbuttons && (params->flag & FILE_DIRSEL_ONLY) == 0) { uiBlockBeginAlign(block); but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMOUT, - min_x + line2_w + separator - chan_offs, line2_y, - btn_fn_w, btn_h, - TIP_("Decrement the filename number")); - RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", -1); - + min_x + line2_w + separator - chan_offs, line2_y, + btn_fn_w, btn_h, + TIP_("Decrement the filename number")); + RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", -1); + but = uiDefIconButO(block, BUT, "FILE_OT_filenum", 0, ICON_ZOOMIN, - min_x + line2_w + separator + btn_fn_w - chan_offs, line2_y, - btn_fn_w, btn_h, - TIP_("Increment the filename number")); - RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", 1); + min_x + line2_w + separator + btn_fn_w - chan_offs, line2_y, + btn_fn_w, btn_h, + TIP_("Increment the filename number")); + RNA_int_set(uiButGetOperatorPtrRNA(but), "increment", 1); uiBlockEndAlign(block); } @@ -235,7 +235,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar) static void draw_tile(int sx, int sy, int width, int height, int colorid, int shade) -{ +{ UI_ThemeColorShade(colorid, shade); uiSetRoundBox(UI_CNR_ALL); uiRoundBox((float)sx, (float)(sy - height), (float)(sx + width), (float)sy, 5.0f); diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index c36cb1bf00e..2f69fc5f99f 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -2335,7 +2335,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo str= "Edit Object %t|Add Object %x0|End Object %x1|Replace Mesh %x2|Track to %x3|Dynamics %x4"; uiDefButS(block, MENU, B_REDR, str, xco+40, yco-24, (width-80), 19, &eoa->type, 0.0, 0.0, 0, 0, ""); - yco-= ysize; + yco-= ysize; break; @@ -2472,9 +2472,9 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo } str= "Constraint Type %t|Location %x0|Distance %x1|Orientation %x2|Force field %x3"; but = uiDefButS(block, MENU, B_REDR, str, xco+40, yco-23, (width-80), 19, &coa->type, 0.0, 0.0, 0, 0, ""); - yco-= ysize; + yco-= ysize; break; - + case ACT_SCENE: sca= act->data; diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 4394b4b1920..e2e47338eee 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -340,8 +340,9 @@ static void node_buts_normal(uiLayout *layout, bContext *UNUSED(C), PointerRNA * uiBut *bt; bt= uiDefButF(block, BUT_NORMAL, B_NODE_EXEC, "", - (short)butr->xmin, (short)butr->xmin, butr->xmax-butr->xmin, butr->xmax-butr->xmin, - nor, 0.0f, 1.0f, 0, 0, ""); + (short)butr->xmin, (short)butr->xmin, + butr->xmax-butr->xmin, butr->xmax-butr->xmin, + nor, 0.0f, 1.0f, 0, 0, ""); uiButSetFunc(bt, node_normal_cb, ntree, node); } #if 0 // not used in 2.5x yet @@ -627,9 +628,9 @@ static void draw_group_socket_name(SpaceNode *snode, bNode *gnode, bNodeSocket * uiButSetFunc(bt, update_group_output_cb, snode, ngroup); } else { - uiDefBut(gnode->block, LABEL, 0, sock->name, - sock->locx+xoffset, sock->locy+1+yoffset, 72, NODE_DY, - NULL, 0, 31, 0, 0, ""); + uiDefBut(gnode->block, LABEL, 0, sock->name, + sock->locx+xoffset, sock->locy+1+yoffset, 72, NODE_DY, + NULL, 0, 31, 0, 0, ""); } } diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index a932f1b10d9..36cba15e5f2 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -585,8 +585,8 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN UI_ThemeColor(color_id); if(node->flag & NODE_MUTED) - UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f); - + UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f); + uiSetRoundBox(UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT); uiRoundBox(rct->xmin, rct->ymax-NODE_DY, rct->xmax, rct->ymax, BASIS_RAD); @@ -758,7 +758,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b /* body */ UI_ThemeColor(color_id); if(node->flag & NODE_MUTED) - UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f); + UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f); uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, hiddenrad); /* outline active and selected emphasis */ diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 8575d0348ab..5fd3d3b45d6 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -170,7 +170,7 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog BLI_mutex_unlock(&pj->queue_lock); seq_proxy_rebuild(pj->main, pj->scene, seq, - stop, do_update, progress); + stop, do_update, progress); seq_free_sequence_recurse(pj->scene, seq); } @@ -195,7 +195,7 @@ static void seq_proxy_build_job(const bContext *C, Sequence * seq) seq = seq_dupli_recursive(scene, scene, seq, 0); steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), - sa, "Building Proxies", WM_JOB_PROGRESS); + sa, "Building Proxies", WM_JOB_PROGRESS); pj = WM_jobs_get_customdata(steve); @@ -209,9 +209,9 @@ static void seq_proxy_build_job(const bContext *C, Sequence * seq) WM_jobs_customdata(steve, pj, proxy_freejob); WM_jobs_timer(steve, 0.1, NC_SCENE|ND_SEQUENCER, - NC_SCENE|ND_SEQUENCER); - WM_jobs_callbacks(steve, proxy_startjob, NULL, NULL, - proxy_endjob); + NC_SCENE|ND_SEQUENCER); + WM_jobs_callbacks(steve, proxy_startjob, NULL, NULL, + proxy_endjob); } BLI_mutex_lock(&pj->queue_lock); @@ -250,9 +250,9 @@ static void UNUSED_FUNCTION(change_plugin_seq)(Scene *scene, char *str) /* calle sh.free(last_seq); sh.init_plugin(last_seq, str); - last_seq->machine = MAX3(last_seq->seq1->machine, - last_seq->seq2->machine, - last_seq->seq3->machine); + last_seq->machine = MAX3(last_seq->seq1->machine, + last_seq->seq2->machine, + last_seq->seq3->machine); if( seq_test_overlap(ed->seqbasep, last_seq) ) shuffle_seq(ed->seqbasep, last_seq, scene); diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index 720081d946b..07ca56cde8b 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -184,7 +184,7 @@ void sequencer_keymap(wmKeyConfig *keyconf) regular number keys */ { int keys[] = { ONEKEY, TWOKEY, THREEKEY, FOURKEY, FIVEKEY, - SIXKEY, SEVENKEY, EIGHTKEY, NINEKEY, ZEROKEY }; + SIXKEY, SEVENKEY, EIGHTKEY, NINEKEY, ZEROKEY }; int i; for (i = 1; i <= 10; i++) { diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index 565d531975b..62cd4fedf0e 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -105,7 +105,7 @@ int text_get_total_lines(struct SpaceText *st, struct ARegion *ar); /* text_ops.c */ enum { LINE_BEGIN, LINE_END, FILE_TOP, FILE_BOTTOM, PREV_CHAR, NEXT_CHAR, - PREV_WORD, NEXT_WORD, PREV_LINE, NEXT_LINE, PREV_PAGE, NEXT_PAGE }; + PREV_WORD, NEXT_WORD, PREV_LINE, NEXT_LINE, PREV_PAGE, NEXT_PAGE }; enum { DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_NEXT_WORD, DEL_PREV_WORD }; void TEXT_OT_new(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 8e20f331698..edcaed43de6 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -448,7 +448,7 @@ static void drawfloor(Scene *scene, View3D *v3d, const char **grid_unit) if(usys) { int i= bUnit_GetBaseUnit(usys); *grid_unit= bUnit_GetNameDisplay(usys, i); - grid_scale = (grid_scale * (float)bUnit_GetScaler(usys, i)) / scene->unit.scale_length; + grid_scale = (grid_scale * (float)bUnit_GetScaler(usys, i)) / scene->unit.scale_length; } } @@ -1267,11 +1267,24 @@ static void backdrawview3d(Scene *scene, ARegion *ar, View3D *v3d) BLI_assert(ar->regiontype == RGN_TYPE_WINDOW); if(base && (base->object->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT) || - paint_facesel_test(base->object))); + paint_facesel_test(base->object))) + { + /* do nothing */ + } else if((base && (base->object->mode & OB_MODE_TEXTURE_PAINT)) && - scene->toolsettings && (scene->toolsettings->imapaint.flag & IMAGEPAINT_PROJECT_DISABLE)); - else if((base && (base->object->mode & OB_MODE_PARTICLE_EDIT)) && v3d->drawtype>OB_WIRE && (v3d->flag & V3D_ZBUF_SELECT)); - else if(scene->obedit && v3d->drawtype>OB_WIRE && (v3d->flag & V3D_ZBUF_SELECT)); + scene->toolsettings && (scene->toolsettings->imapaint.flag & IMAGEPAINT_PROJECT_DISABLE)) + { + /* do nothing */ + } + else if((base && (base->object->mode & OB_MODE_PARTICLE_EDIT)) && + v3d->drawtype > OB_WIRE && (v3d->flag & V3D_ZBUF_SELECT)) + { + /* do nothing */ + } + else if(scene->obedit && v3d->drawtype>OB_WIRE && + (v3d->flag & V3D_ZBUF_SELECT)) { + /* do nothing */ + } else { v3d->flag &= ~V3D_INVALID_BACKBUF; return; diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 7cd9c07c00c..b2707db806f 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -977,7 +977,7 @@ void VIEW3D_OT_snap_cursor_to_center(wmOperatorType *ot) ot->poll= ED_operator_view3d_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; } /* **************************************************** */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 7ab1b24e9b3..e19c115b194 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1256,7 +1256,7 @@ static void createTransArmatureVerts(TransInfo *t) static void createTransMBallVerts(TransInfo *t) { MetaBall *mb = (MetaBall*)t->obedit->data; - MetaElem *ml; + MetaElem *ml; TransData *td; TransDataExtension *tx; float mtx[3][3], smtx[3][3]; diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 5d61d2a1ebb..442ad662813 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -792,7 +792,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], float mat[4][4]; /* Rotation of MetaElem is stored in quat */ - quat_to_mat4( mat,ml_sel->quat); + quat_to_mat4( mat,ml_sel->quat); copy_v3_v3(normal, mat[2]); |