Cleanup: format, reduce line length & strip trailing space
This commit is contained in:
parent
ae2d2c9361
commit
30e666f747
|
@ -145,8 +145,8 @@ if(CYCLES_STANDALONE_REPOSITORY)
|
|||
-DOIIO_STATIC_DEFINE
|
||||
)
|
||||
|
||||
set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO_ROOT_DIR}/include)
|
||||
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR} ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO)
|
||||
set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO_ROOT_DIR}/include)
|
||||
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR} ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO)
|
||||
# Special exceptions for libraries which needs explicit debug version
|
||||
set(OPENIMAGEIO_LIBRARIES
|
||||
optimized ${OPENIMAGEIO_ROOT_DIR}/lib/OpenImageIO.lib
|
||||
|
|
|
@ -256,7 +256,7 @@ PYGETTEXT_KEYWORDS = (() +
|
|||
# bUnitDef unit names.
|
||||
# NOTE: regex is a bit more complex than it would need too. Since the actual
|
||||
# identifier (`B_UNIT_DEF_`) is at the end, if it's simpler/too general it
|
||||
# becomes extremely slow to process some (unrelated) source files.
|
||||
# becomes extremely slow to process some (unrelated) source files.
|
||||
((r"\{(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*NULL\s*,)){4}\s*" +
|
||||
_msg_re + r"\s*,(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*NULL\s*,))(?:[^,]+,){2}"
|
||||
+ "\s*B_UNIT_DEF_[_A-Z]+\s*\}"),) +
|
||||
|
|
|
@ -140,4 +140,4 @@ void DRW_select_buffer_context_create(struct Base **bases, uint bases_len, short
|
|||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -203,4 +203,4 @@ vec3 coordinate_incoming(vec3 P)
|
|||
#else
|
||||
return cameraVec(P);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
@ -76,4 +76,4 @@ vec3 coordinate_reflect(vec3 P, vec3 N)
|
|||
vec3 coordinate_incoming(vec3 P)
|
||||
{
|
||||
return vec3(0.0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -235,4 +235,4 @@ void ForwardPipeline::render(const DRWView *view,
|
|||
|
||||
/** \} */
|
||||
|
||||
} // namespace blender::eevee
|
||||
} // namespace blender::eevee
|
||||
|
|
|
@ -226,4 +226,4 @@ class PipelineModule {
|
|||
|
||||
/** \} */
|
||||
|
||||
} // namespace blender::eevee
|
||||
} // namespace blender::eevee
|
||||
|
|
|
@ -647,7 +647,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
|
|||
drw_call_calc_orco(ob, ob_infos->orcotexfac);
|
||||
/* Random float value. */
|
||||
uint random = (DST.dupli_source) ?
|
||||
DST.dupli_source->random_id :
|
||||
DST.dupli_source->random_id :
|
||||
/* TODO(fclem): this is rather costly to do at runtime. Maybe we can
|
||||
* put it in ob->runtime and make depsgraph ensure it is up to date. */
|
||||
BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
|
||||
|
|
|
@ -28,4 +28,3 @@ set(LIB
|
|||
|
||||
blender_add_lib(bf_editor_curves "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
add_dependencies(bf_editor_curves bf_rna)
|
||||
|
||||
|
|
|
@ -321,4 +321,4 @@ void MESH_OT_customdata_custom_splitnormals_clear(struct wmOperatorType *ot);
|
|||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1098,11 +1098,8 @@ static void draw_seq_background(Scene *scene,
|
|||
|
||||
/* Draw the main strip body. */
|
||||
if (is_single_image) {
|
||||
immRectf(pos,
|
||||
SEQ_time_left_handle_frame_get(seq),
|
||||
y1,
|
||||
SEQ_time_right_handle_frame_get(seq),
|
||||
y2);
|
||||
immRectf(
|
||||
pos, SEQ_time_left_handle_frame_get(seq), y1, SEQ_time_right_handle_frame_get(seq), y2);
|
||||
}
|
||||
else {
|
||||
immRectf(pos, x1, y1, x2, y2);
|
||||
|
|
|
@ -15,4 +15,4 @@ typedef enum eGPUFrontFace {
|
|||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -7,4 +7,4 @@ in vec2 texCoord_interp;
|
|||
void main()
|
||||
{
|
||||
gl_FragDepth = textureLod(source_data, texCoord_interp, mip).r;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,4 +10,4 @@ void main()
|
|||
uint stencil = (val >> 24) & 0xFFu;
|
||||
uint depth = (val)&0xFFFFFFu;
|
||||
gl_FragDepth = float(depth) / float(0xFFFFFFu);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,4 +9,4 @@ void main()
|
|||
uint val = textureLod(source_data, texCoord_interp, mip).r;
|
||||
uint depth = (val) & (0xFFFFFFFFu);
|
||||
gl_FragDepth = float(depth) / float(0xFFFFFFFFu);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,4 +30,4 @@ void main()
|
|||
texCoord_interp = tex.zy;
|
||||
}
|
||||
gl_Position = vec4(rect.xy, 0.0f, 1.0f);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -303,7 +303,8 @@
|
|||
.crease_threshold = DEG2RAD(140.0f), \
|
||||
.calculation_flags = LRT_ALLOW_DUPLI_OBJECTS | LRT_ALLOW_CLIPPING_BOUNDARIES | \
|
||||
LRT_USE_CREASE_ON_SHARP_EDGES | LRT_FILTER_FACE_MARK_KEEP_CONTOUR, \
|
||||
.angle_splitting_threshold = 0.0f, /* Do not split by default, this is for better chaining quality. */ \
|
||||
/* Do not split by default, this is for better chaining quality. */ \
|
||||
.angle_splitting_threshold = 0.0f, \
|
||||
.chaining_image_threshold = 0.001f, \
|
||||
.chain_smooth_tolerance = 0.2f,\
|
||||
.stroke_depth_offset = 0.05,\
|
||||
|
|
|
@ -161,7 +161,7 @@ typedef struct Sequence {
|
|||
* Frames that use the first frame before data begins,
|
||||
* frames that use the last frame after data ends.
|
||||
*/
|
||||
int startstill DNA_DEPRECATED, endstill DNA_DEPRECATED;
|
||||
int startstill DNA_DEPRECATED, endstill DNA_DEPRECATED;
|
||||
/** Machine: the strip channel */
|
||||
int machine;
|
||||
int _pad3;
|
||||
|
|
|
@ -58,4 +58,4 @@ void MOD_depsgraph_update_object_bone_relation(struct DepsNodeHandle *node,
|
|||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -15,4 +15,4 @@ extern PyMethodDef BPY_rna_region_from_string_method_def;
|
|||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue