diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/rct.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_intern.h | 18 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawanimviz.c | 18 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_stereo.c | 2 |
12 files changed, 34 insertions, 33 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 0f09b741330..8d63c1cfb44 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -150,7 +150,7 @@ void BKE_brush_init(Brush *brush) /** * \note Resulting brush will have two users: one as a fake user, another is assumed to be used by the caller. - .*/ + */ Brush *BKE_brush_add(Main *bmain, const char *name, short ob_mode) { Brush *brush; @@ -1066,7 +1066,8 @@ struct ImBuf *BKE_brush_gen_radial_control_imbuf(Brush *br, bool secondary) for (i = 0; i < side; ++i) { for (j = 0; j < side; ++j) { const int col = texcache[i * side + j]; - im->rect_float[i * side + j] *= (((char *)&col)[0] + ((char *)&col)[1] + ((char *)&col)[2]) / 3.0f / 255.0f; + im->rect_float[i * side + j] *= + (((char *)&col)[0] + ((char *)&col)[1] + ((char *)&col)[2]) / 3.0f / 255.0f; } } diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index eec8d2478da..22ff8bf4bb7 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -625,7 +625,7 @@ float defvert_array_find_weight_safe(const struct MDeformVert *dvert, const int * (i.e. maximum weight, as if no vgroup was selected). * But in case of valid defgroup and NULL dvert data pointer, it means that vgroup **is** valid, * and just totally empty, so we shall return '0.0' value then! - */ + */ if (defgroup == -1) { return 1.0f; } diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 9ba7cc1c679..e3e403251e1 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -112,9 +112,9 @@ static void image_add_view(Image *ima, const char *viewname, const char *filepat /* quick lookup: supports 1 million frames, thousand passes */ #define IMA_MAKE_INDEX(frame, index) (((frame) << 10) + (index)) #define IMA_INDEX_FRAME(index) ((index) >> 10) -/* +#if 0 #define IMA_INDEX_PASS(index) (index & ~1023) -*/ +#endif /* ******** IMAGE CACHE ************* */ diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c index 3adc6b30f6e..764b12431d0 100644 --- a/source/blender/blenlib/intern/rct.c +++ b/source/blender/blenlib/intern/rct.c @@ -128,7 +128,7 @@ bool BLI_rctf_isect_pt_v(const rctf *rect, const float xy[2]) /** * \returns shortest distance from \a rect to x/y (0 if inside) -*/ + */ int BLI_rcti_length_x(const rcti *rect, const int x) { diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index d00d0d508c7..a1fb13ecdfb 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1692,7 +1692,7 @@ static void build_boundary_vertex_only(BevelParams *bp, BevVert *bv, bool constr * Special case of build_boundary when a single edge is beveled. * The 'width adjust' part of build_boundary has been done already, * and \a efirst is the first beveled edge at vertex \a bv. -*/ + */ static void build_boundary_terminal_edge(BevelParams *bp, BevVert *bv, EdgeHalf *efirst, bool construct) { MemArena *mem_arena = bp->mem_arena; @@ -4933,7 +4933,7 @@ static void bevel_limit_offset(BevelParams *bp) * so we can just multiply them all by the reduction factor * of the offset to have the effect of recalculating the specs * with the new limited_offset. - */ + */ offset_factor = limited_offset / bp->offset; GHASH_ITER(giter, bp->vert_hash) { bv = BLI_ghashIterator_getValue(&giter); diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 44aca23e2cc..e407d342603 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -397,7 +397,7 @@ void EDBM_mesh_load(Object *ob) * of freed data on scene update, especially in cases when there are dependency * cycles. */ - /* +#if 0 for (Object *other_object = G.main->object.first; other_object != NULL; other_object = other_object->id.next) @@ -406,7 +406,7 @@ void EDBM_mesh_load(Object *ob) BKE_object_free_derived_caches(other_object); } } - */ +#endif } /** diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 7abccf6bf62..6303d700b40 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1188,7 +1188,7 @@ static void vwpaint_update_cache_invariants( cache->invert = mode == BRUSH_STROKE_INVERT; cache->alt_smooth = mode == BRUSH_STROKE_SMOOTH; /* not very nice, but with current events system implementation - * we can't handle brush appearance inversion hotkey separately (sergey) */ + * we can't handle brush appearance inversion hotkey separately (sergey) */ if (cache->invert) ups->draw_inverted = true; else ups->draw_inverted = false; diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index aaea13ce5d0..5fb9eee805f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -119,7 +119,7 @@ typedef struct SculptUndoNode { } SculptUndoNode; /* Factor of brush to have rake point following behind -* (could be configurable but this is reasonable default). */ + * (could be configurable but this is reasonable default). */ #define SCULPT_RAKE_BRUSH_FACTOR 0.25f struct SculptRakeData { @@ -148,7 +148,7 @@ typedef struct SculptThreadedTaskData { /* Data specific to some callbacks. */ /* Note: even if only one or two of those are used at a time, keeping them separated, names help figuring out - * what it is, and memory overhead is ridiculous anyway... */ + * what it is, and memory overhead is ridiculous anyway... */ float flippedbstrength; float angle; float strength; @@ -239,10 +239,10 @@ void sculpt_pbvh_calc_area_normal( float r_area_no[3]); /* Cache stroke properties. Used because -* RNA property lookup isn't particularly fast. -* -* For descriptions of these settings, check the operator properties. -*/ + * RNA property lookup isn't particularly fast. + * + * For descriptions of these settings, check the operator properties. + */ typedef struct StrokeCache { /* Invariants */ @@ -296,13 +296,13 @@ typedef struct StrokeCache { float view_normal[3]; /* sculpt_normal gets calculated by calc_sculpt_normal(), then the - * sculpt_normal_symm gets updated quickly with the usual symmetry - * transforms */ + * sculpt_normal_symm gets updated quickly with the usual symmetry + * transforms */ float sculpt_normal[3]; float sculpt_normal_symm[3]; /* Used for area texture mode, local_mat gets calculated by - * calc_brush_local_mat() and used in tex_strength(). */ + * calc_brush_local_mat() and used in tex_strength(). */ float brush_local_mat[4][4]; float plane_offset[3]; /* used to shift the plane around when doing tiled strokes */ diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index f0e65f84205..a99ac0d46a5 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -76,15 +76,15 @@ void draw_motion_paths_init(View3D *v3d, ARegion *ar) } /* set color -* - more intense for active/selected bones, less intense for unselected bones -* - black for before current frame, green for current frame, blue for after current frame -* - intensity decreases as distance from current frame increases -* -* If the user select custom color, the color is replaced for the color selected in UI panel -* - 75% Darker color is used for previous frames -* - 50% Darker color for current frame -* - User selected color for next frames -*/ + * - more intense for active/selected bones, less intense for unselected bones + * - black for before current frame, green for current frame, blue for after current frame + * - intensity decreases as distance from current frame increases + * + * If the user select custom color, the color is replaced for the color selected in UI panel + * - 75% Darker color is used for previous frames + * - 50% Darker color for current frame + * - User selected color for next frames + */ static void set_motion_path_color(Scene *scene, bMotionPath *mpath, int i, short sel, int sfra, int efra, float prev_color[3], float frame_color[3], float next_color[3]) { diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 63bdf3ac010..eafb3650d36 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -136,7 +136,7 @@ struct SnapObjectContext { /* -------------------------------------------------------------------- */ /** Common utilities -* \{ */ + * \{ */ typedef void(*IterSnapObjsCallback)(SnapObjectContext *sctx, bool is_obedit, Object *ob, float obmat[4][4], void *data); @@ -260,7 +260,7 @@ static int dm_looptri_to_poly_index(DerivedMesh *dm, const MLoopTri *lt); /* -------------------------------------------------------------------- */ /** \name Ray Cast Funcs -* \{ */ + * \{ */ /* Store all ray-hits * Support for storing all depths, not just the first (raycast 'all') */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index cddb1e06b8c..84818fe79c2 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -816,7 +816,7 @@ typedef enum eColorPicker_Types { } eColorPicker_Types; /* timecode display styles - * UserDef.timecode_style */ + * UserDef.timecode_style */ typedef enum eTimecodeStyles { /* as little info as is necessary to show relevant info * with '+' to denote the frames diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index 66ebf18c9e1..55fe2ec846c 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -347,7 +347,7 @@ bool WM_stereo3d_enabled(wmWindow *win, bool skip_stereo3d_check) /** * If needed, this adjusts \a r_mouse_xy so that drawn cursor and handled mouse position are matching visually. -*/ + */ void wm_stereo3d_mouse_offset_apply(wmWindow *win, int *r_mouse_xy) { if (!WM_stereo3d_enabled(win, false)) |