Commit: 62faffc8003ed96806fbccb56b99e8c9901e3767
Author: Campbell Barton
Date: Wed Mar 11 13:15:52 2015 +1100
Branches: master
https://developer.blender.org/rB62faffc8003ed96806fbccb56b99e8c9901e3767
Cleanup: style
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/gpu/GPU_debug.h
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/physics/intern/BPH_mass_spring.cpp
M source/creator/creator.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 7b3f869..58ef918 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 02c5df0..a74c0e7 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 4a99168..bd16fd0 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 1387f63..e0ca945 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++) {
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 47ee1ec..0ca5fbe 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -598,10 +598,9 @@ static void blender_crash_handler(int signum)
}
#ifdef WIN32
-LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS * ExceptionInfo)
+LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)
{
- switch(ExceptionInfo->ExceptionRecord->ExceptionCode)
- {
+ switch (ExceptionInfo->ExceptionRecord->ExceptionCode) {
case EXCEPTION_ACCESS_VIOLATION:
fputs("Error: EXCEPTION_ACCESS_VIOLATION\n", stderr);
break;
@@ -671,8 +670,7 @@ LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *
ExceptionInfo)
/* If this is a stack overflow then we can't walk the stack, so just
show
* where the error happened */
- if (EXCEPTION_STACK_OVERFLOW !=
ExceptionInfo->ExceptionRecord->ExceptionCode)
- {
+ if (EXCEPTION_STACK_OVERFLOW !=
ExceptionInfo->ExceptionRecord->ExceptionCode) {
blender_crash_handler(SIGSEGV);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
