bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2017-03-13 04:25:21 +11:00
parent 8ca11f5b72
commit f28376d8d9
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/alembic/intern/abc_exporter.cc
View File

@ -347,7 +347,7 @@ void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx)
Object *ob = base->object;
if (export_object(&m_settings, ob)) {
switch(ob->type) {
switch (ob->type) {
case OB_LAMP:
case OB_LATTICE:
case OB_MBALL:
@ -533,7 +533,7 @@ void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent)
}
}
switch(ob->type) {
switch (ob->type) {
case OB_MESH:
{
Mesh *me = static_cast<Mesh *>(ob->data);

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

@ -67,7 +67,7 @@
#include "BKE_deform.h"
/* Workaround for cyclic depenndnecy with curves.
/* Workaround for cyclic dependency with curves.
* In such case curve_cache might not be ready yet,
*/
#define CYCLIC_DEPENDENCY_WORKAROUND

6
source/blender/blenkernel/intern/tracking_stabilize.c
View File

@ -755,7 +755,8 @@ static void average_marker_positions(StabContext *ctx, int framenr, float r_ref_
if (ok) {
r_ref_pos[0] /= weight_sum;
r_ref_pos[1] /= weight_sum;
} else {
}
else {
/* No usable tracking data on any track on this frame.
* Use data from neighbouring frames to extrapolate...
*/
@ -784,7 +785,8 @@ static void average_marker_positions(StabContext *ctx, int framenr, float r_ref_
* Also default to this frame when we're in a gap */
average_marker_positions(ctx, next_lower, r_ref_pos);
} else if (next_higher < MAXFRAME) {
}
else if (next_higher < MAXFRAME) {
average_marker_positions(ctx, next_higher, r_ref_pos);
}
use_values_from_fcurves(ctx, false);

7
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -568,7 +568,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
if (context->ffmpeg_crf >= 0) {
ffmpeg_dict_set_int(&opts, "crf", context->ffmpeg_crf);
} else {
}
else {
c->bit_rate = context->ffmpeg_video_bitrate * 1000;
c->rc_max_rate = rd->ffcodecdata.rc_max_rate * 1000;
c->rc_min_rate = rd->ffcodecdata.rc_min_rate * 1000;
@ -576,8 +577,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
}
if (context->ffmpeg_preset) {
char const * preset_name;
switch(context->ffmpeg_preset) {
char const *preset_name;
switch (context->ffmpeg_preset) {
case FFM_PRESET_ULTRAFAST: preset_name = "ultrafast"; break;
case FFM_PRESET_SUPERFAST: preset_name = "superfast"; break;
case FFM_PRESET_VERYFAST: preset_name = "veryfast"; break;

3
source/blender/bmesh/intern/bmesh_core.c
View File

@ -2756,7 +2756,8 @@ BMVert *bmesh_urmv_loop_multi(
}
STACK_PUSH(edges, e_iter);
} else {
}
else {
/* at least one edge attached isn't connected to our loops */
is_mixed_edge_any = true;
}

4
source/blender/render/intern/source/shadeoutput.c
View File

@ -2143,7 +2143,7 @@ const float (*RE_object_instance_get_matrix(struct ObjectInstanceRen *obi, int m
const float (*RE_render_current_get_matrix(int matrix_id))[4]
{
switch(matrix_id) {
switch (matrix_id) {
case RE_VIEW_MATRIX:
return (const float(*)[4])R.viewmat;
case RE_VIEWINV_MATRIX:
@ -2171,4 +2171,4 @@ float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta)
}
return result;
}
}