archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: indentation

Browse Source
This commit is contained in:
Campbell Barton
2018-01-16 11:40:43 +11:00
parent 6f45dea6ee
commit e428ea3e00
15 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/bmesh/operators/bmo_connect_pair.c
View File

@@ -72,14 +72,15 @@
BMO_vert_flag_test(pc->bm_bmoflag, v, VERT_EXCLUDE) == 0) BMO_vert_flag_test(pc->bm_bmoflag, v, VERT_EXCLUDE) == 0)
#if 0 #if 0
#define ELE_TOUCH_TEST(e) \ #define ELE_TOUCH_TEST(e) ( \
(CHECK_TYPE_ANY(e, BMVert *, BMEdge *, BMElem *, BMElemF *), \ CHECK_TYPE_ANY(e, BMVert *, BMEdge *, BMElem *, BMElemF *), \
BMO_elem_flag_test(pc->bm_bmoflag, (BMElemF *)e, ELE_TOUCHED)) BMO_elem_flag_test(pc->bm_bmoflag, (BMElemF *)e, ELE_TOUCHED) \
)
#endif #endif
#define ELE_TOUCH_MARK(e) \ #define ELE_TOUCH_MARK(e) { \
{ CHECK_TYPE_ANY(e, BMVert *, BMEdge *, BMElem *, BMElemF *); \ CHECK_TYPE_ANY(e, BMVert *, BMEdge *, BMElem *, BMElemF *); \
BMO_elem_flag_enable(pc->bm_bmoflag, (BMElemF *)e, ELE_TOUCHED); } ((void)0) BMO_elem_flag_enable(pc->bm_bmoflag, (BMElemF *)e, ELE_TOUCHED); \
} ((void)0)
#define ELE_TOUCH_TEST_VERT(v) BMO_vert_flag_test(pc->bm_bmoflag, v, ELE_TOUCHED) #define ELE_TOUCH_TEST_VERT(v) BMO_vert_flag_test(pc->bm_bmoflag, v, ELE_TOUCHED)
// #define ELE_TOUCH_MARK_VERT(v) BMO_vert_flag_enable(pc->bm_bmoflag, (BMElemF *)v, ELE_TOUCHED) // #define ELE_TOUCH_MARK_VERT(v) BMO_vert_flag_enable(pc->bm_bmoflag, (BMElemF *)v, ELE_TOUCHED)

7
source/blender/collada/AnimationImporter.cpp
View File

@@ -816,10 +816,11 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a
float rot[4], loc[3], scale[3]; float rot[4], loc[3], scale[3];
mat4_to_quat(rot, mat); mat4_to_quat(rot, mat);
/*for ( int i = 0 ; i < 4 ; i ++ ) #if 0
{ for (int i = 0 ; i < 4; i++) {
rot[i] = RAD2DEGF(rot[i]); rot[i] = RAD2DEGF(rot[i]);
}*/ }
#endif
copy_v3_v3(loc, mat[3]); copy_v3_v3(loc, mat[3]);
mat4_to_size(scale, mat); mat4_to_size(scale, mat);

6
source/blender/editors/space_view3d/drawobject.c
View File

@@ -926,10 +926,8 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write)
col_pack_prev = vos->col.pack; col_pack_prev = vos->col.pack;
} }
((vos->flag & V3D_CACHE_TEXT_ASCII) ? ((vos->flag & V3D_CACHE_TEXT_ASCII) ? BLF_draw_default_ascii : BLF_draw_default)(
BLF_draw_default_ascii : (float)(vos->sco[0] + vos->xoffs),
BLF_draw_default
)((float)(vos->sco[0] + vos->xoffs),
(float)(vos->sco[1]), (float)(vos->sco[1]),
(depth_write) ? 0.0f : 2.0f, (depth_write) ? 0.0f : 2.0f,
vos->str, vos->str,

4
source/blender/gpu/shaders/gpu_shader_material.glsl
View File

@@ -954,8 +954,8 @@ void texco_orco(vec3 attorco, out vec3 orco)
void texco_uv(vec2 attuv, out vec3 uv) void texco_uv(vec2 attuv, out vec3 uv)
{ {
/* disabled for now, works together with leaving out mtex_2d_mapping /* disabled for now, works together with leaving out mtex_2d_mapping */
uv = vec3(attuv*2.0 - vec2(1.0, 1.0), 0.0); */ // uv = vec3(attuv*2.0 - vec2(1.0, 1.0), 0.0); */
uv = vec3(attuv, 0.0); uv = vec3(attuv, 0.0);
} }

7
source/blender/render/intern/source/convertblender.c
View File

@@ -3794,11 +3794,12 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
copy_v3_v3(vec, ob->obmat[2]); copy_v3_v3(vec, ob->obmat[2]);
normalize_v3(vec); normalize_v3(vec);
InitSunSky(lar->sunsky, la->atm_turbidity, vec, la->horizon_brightness, InitSunSky(
lar->sunsky, la->atm_turbidity, vec, la->horizon_brightness,
la->spread, la->sun_brightness, la->sun_size, la->backscattered_light, la->spread, la->sun_brightness, la->sun_size, la->backscattered_light,
la->skyblendfac, la->skyblendtype, la->sky_exposure, la->sky_colorspace); la->skyblendfac, la->skyblendtype, la->sky_exposure, la->sky_colorspace);
InitAtmosphere(
InitAtmosphere(lar->sunsky, la->sun_intensity, 1.0, 1.0, la->atm_inscattering_factor, la->atm_extinction_factor, lar->sunsky, la->sun_intensity, 1.0, 1.0, la->atm_inscattering_factor, la->atm_extinction_factor,
la->atm_distance_factor); la->atm_distance_factor);
} }
} }