diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-11 05:15:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-11 05:15:52 +0300 |
| commit | 62faffc8003ed96806fbccb56b99e8c9901e3767 (patch) | |
| tree | 9e8c74d4c7fa696ef201c920414ab917baff0d03 /source/blender | |
| parent | 6b610500b99d8e6ac2950d7702f669b9fa1192fe (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_debug.h | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 4 | ||||
| -rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 7b3f8697ccd..58ef9184dd0 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3192,7 +3192,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Scene *scene, View3D *v3d, ARegion *ar, in /* render 3d view */ if (rv3d->persp == RV3D_CAMOB && v3d->camera) { CameraParams params; - GPUFXSettings fx_settings = {0}; + GPUFXSettings fx_settings = {NULL}; Object *camera = v3d->camera; BKE_camera_params_init(¶ms); diff --git a/source/blender/gpu/GPU_debug.h b/source/blender/gpu/GPU_debug.h index 02c5df013af..a74c0e7c67b 100644 --- a/source/blender/gpu/GPU_debug.h +++ b/source/blender/gpu/GPU_debug.h @@ -74,5 +74,4 @@ void gpu_string_marker (size_t size, const char *str); } #endif - -#endif /* __GPU_DEBUG_H__ */
\ No newline at end of file +#endif /* __GPU_DEBUG_H__ */ diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index 4a99168f351..bd16fd07044 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -996,13 +996,13 @@ static void connect_frames( float dot = 0.0f; for (i = 0; i < 4; i++) { - mid_v3_v3v3v3v3(cent_sides[i], UNPACK4_EX(,q[i],->co)); + mid_v3_v3v3v3v3(cent_sides[i], UNPACK4_EX(, q[i], ->co)); } mid_v3_v3v3v3v3(cent, UNPACK4(cent_sides)); for (i = 0; i < 4; i++) { float p[3], no[3]; - normal_quad_v3(no, UNPACK4_EX(,q[i],->co)); + normal_quad_v3(no, UNPACK4_EX(, q[i], ->co)); sub_v3_v3v3(p, cent, cent_sides[i]); dot += dot_v3v3(no, p); } diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index 1387f633c20..e0ca945eaf7 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -885,7 +885,7 @@ static void cloth_collision_solve_extra(Object *ob, ClothModifierData *clmd, Lis // call collision function
// TODO: check if "step" or "step+dt" is correct - dg
- do_extra_solve = cloth_bvh_objcollision(ob, clmd, step/clmd->sim_parms->timescale, dt/clmd->sim_parms->timescale);
+ do_extra_solve = cloth_bvh_objcollision(ob, clmd, step / clmd->sim_parms->timescale, dt / clmd->sim_parms->timescale);
// copy corrected positions back to simulation
for (i = 0; i < numverts; i++) {
|