sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2015-03-11 13:15:52 +11:00
parent 6b610500b9
commit 62faffc800
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -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(&params);

3
source/blender/gpu/GPU_debug.h
View File

@ -74,5 +74,4 @@ void gpu_string_marker (size_t size, const char *str);
}
#endif
#endif /* __GPU_DEBUG_H__ */
#endif /* __GPU_DEBUG_H__ */

4
source/blender/modifiers/intern/MOD_skin.c
View File

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

2
source/blender/physics/intern/BPH_mass_spring.cpp
View File

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

8
source/creator/creator.c
View File

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