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

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-11-01 07:31:49 +11:00
parent 35b888fbda
commit 798cd8a723
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/fcurve.c
View File

@@ -911,7 +911,8 @@ eFCU_Cycle_Type BKE_fcurve_get_cycle_type(FCurve *fcu)
} }
if (ELEM(data->before_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET) && if (ELEM(data->before_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET) &&
ELEM(data->after_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET)) { ELEM(data->after_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET))
{
return FCU_CYCLE_OFFSET; return FCU_CYCLE_OFFSET;
} }
} }

4
source/blender/blenkernel/intern/object.c
View File

@@ -834,8 +834,8 @@ void BKE_object_init(Object *ob)
ob->empty_drawsize = 1.0; ob->empty_drawsize = 1.0;
ob->empty_image_depth = OB_EMPTY_IMAGE_DEPTH_DEFAULT; ob->empty_image_depth = OB_EMPTY_IMAGE_DEPTH_DEFAULT;
ob->empty_image_visibility_flag = ( ob->empty_image_visibility_flag = (
OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE |
| OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC); OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
if (ob->type == OB_EMPTY) { if (ob->type == OB_EMPTY) {
copy_v2_fl(ob->ima_ofs, -0.5f); copy_v2_fl(ob->ima_ofs, -0.5f);
} }

2
source/blender/blenkernel/intern/subdiv_converter_mesh.c
View File

@@ -88,7 +88,7 @@ static OpenSubdiv_SchemeType get_scheme_type(
} }
static OpenSubdiv_VtxBoundaryInterpolation get_vtx_boundary_interpolation( static OpenSubdiv_VtxBoundaryInterpolation get_vtx_boundary_interpolation(
const struct OpenSubdiv_Converter* converter) { const struct OpenSubdiv_Converter *converter) {
ConverterStorage *storage = converter->user_data; ConverterStorage *storage = converter->user_data;
return BKE_subdiv_converter_vtx_boundary_interpolation_from_settings( return BKE_subdiv_converter_vtx_boundary_interpolation_from_settings(
&storage->settings); &storage->settings);

4
source/blender/blenloader/intern/versioning_280.c
View File

@@ -2222,8 +2222,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (Object *ob = bmain->object.first; ob; ob = ob->id.next) { for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
ob->empty_image_visibility_flag = ( ob->empty_image_visibility_flag = (
OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE |
| OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC); OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
} }
} }

4
source/blender/editors/animation/keyframing.c
View File

@@ -322,7 +322,7 @@ static eFCU_Cycle_Type remap_cyclic_keyframe_location(FCurve *fcu, float *px, fl
return FCU_CYCLE_NONE; return FCU_CYCLE_NONE;
} }
BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert-1]; BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert - 1];
float start = first->vec[1][0], end = last->vec[1][0]; float start = first->vec[1][0], end = last->vec[1][0];
if (start >= end) { if (start >= end) {
@@ -336,7 +336,7 @@ static eFCU_Cycle_Type remap_cyclic_keyframe_location(FCurve *fcu, float *px, fl
if (type == FCU_CYCLE_OFFSET) { if (type == FCU_CYCLE_OFFSET) {
/* Nasty check to handle the case when the modes are different better. */ /* Nasty check to handle the case when the modes are different better. */
FMod_Cycles *data = (FMod_Cycles *)((FModifier*)fcu->modifiers.first)->data; FMod_Cycles *data = ((FModifier *)fcu->modifiers.first)->data;
short mode = (step >= 0) ? data->after_mode : data->before_mode; short mode = (step >= 0) ? data->after_mode : data->before_mode;
if (mode == FCM_EXTRAPOLATE_CYCLIC_OFFSET) { if (mode == FCM_EXTRAPOLATE_CYCLIC_OFFSET) {

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

@@ -132,7 +132,7 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UN
Object *ob = CTX_data_active_object(C); Object *ob = CTX_data_active_object(C);
if (ob && ob->type == OB_EMPTY) { if (ob && ob->type == OB_EMPTY) {
if (ob->empty_drawtype == OB_EMPTY_IMAGE){ if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
return is_image_empty_visible(ob, rv3d); return is_image_empty_visible(ob, rv3d);
} }
} }