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

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2013-04-03 01:36:00 +00:00
parent 6a47f756a6
commit ff7b353ce6
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ static int write_audio_frame(void)
{
AVCodecContext *c = NULL;
AVPacket pkt;
AVFrame* frame;
AVFrame *frame;
int got_output = 0;
c = audio_stream->codec;
@ -142,12 +142,12 @@ static int write_audio_frame(void)
AUD_readDevice(audio_mixdown_device, audio_input_buffer, audio_input_samples);
audio_time += (double) audio_input_samples / (double) c->sample_rate;
if(audio_deinterleave) {
if (audio_deinterleave) {
int channel, i;
uint8_t* temp;
uint8_t *temp;
for(channel = 0; channel < c->channels; channel++) {
for(i = 0; i < frame->nb_samples; i++) {
for (channel = 0; channel < c->channels; channel++) {
for (i = 0; i < frame->nb_samples; i++) {
memcpy(audio_deinterleave_buffer + (i + channel * frame->nb_samples) * audio_sample_size,
audio_input_buffer + (c->channels * i + channel) * audio_sample_size, audio_sample_size);
}
@ -159,14 +159,14 @@ static int write_audio_frame(void)
}
avcodec_fill_audio_frame(frame, c->channels, c->sample_fmt, audio_input_buffer,
audio_input_samples * c->channels * audio_sample_size, 0);
audio_input_samples * c->channels * audio_sample_size, 0);
if(avcodec_encode_audio2(c, &pkt, frame, &got_output) < 0) {
if (avcodec_encode_audio2(c, &pkt, frame, &got_output) < 0) {
// XXX error("Error writing audio packet");
return -1;
}
if(got_output) {
if (got_output) {
if (c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE) {
pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, audio_stream->time_base);
PRINT("Audio Frame PTS: %d\n", (int) pkt.pts);
@ -733,7 +733,7 @@ static AVStream *alloc_audio_stream(RenderData *rd, int codec_id, AVFormatContex
audio_input_buffer = (uint8_t *) av_malloc(audio_input_samples * c->channels * audio_sample_size);
if(audio_deinterleave)
if (audio_deinterleave)
audio_deinterleave_buffer = (uint8_t *) av_malloc(audio_input_samples * c->channels * audio_sample_size);
audio_time = 0.0f;
@ -1036,8 +1036,7 @@ int BKE_ffmpeg_start(struct Scene *scene, RenderData *rd, int rectx, int recty,
AUD_DeviceSpecs specs;
specs.channels = c->channels;
switch(av_get_packed_sample_fmt(c->sample_fmt))
{
switch (av_get_packed_sample_fmt(c->sample_fmt)) {
case AV_SAMPLE_FMT_U8:
specs.format = AUD_FORMAT_U8;
break;

2
source/blender/editors/sculpt_paint/paint_ops.c
View File

@ -520,7 +520,7 @@ static int stencil_control_modal(bContext *C, wmOperator *op, const wmEvent *eve
float len, factor;
sub_v2_v2v2_int(mdiff, event->mval, scd->br->stencil_pos);
len = sqrtf(mdiff[0] * mdiff[0] + mdiff[1] * mdiff[1]);
factor = len/scd->lenorig;
factor = len / scd->lenorig;
mdiff[0] = factor * scd->init_sdim[0];
mdiff[1] = factor * scd->init_sdim[1];
copy_v2_v2_int(scd->br->stencil_dimension, mdiff);

2
source/blender/editors/sculpt_paint/paint_utils.c
View File

@ -382,7 +382,7 @@ static int brush_curve_preset_exec(bContext *C, wmOperator *op)
{
Brush *br = paint_brush(paint_get_active_from_context(C));
if(br)
if (br)
BKE_brush_curve_preset(br, RNA_enum_get(op->ptr, "shape"));
return OPERATOR_FINISHED;

6
source/blender/editors/space_buttons/buttons_texture.c
View File

@ -333,14 +333,14 @@ static void template_texture_select(bContext *C, void *user_p, void *UNUSED(arg)
ct->texture = tex;
if(user->ptr.type == &RNA_ParticleSettingsTextureSlot) {
if (user->ptr.type == &RNA_ParticleSettingsTextureSlot) {
/* stupid exception for particle systems which still uses influence
* from the old texture system, set the active texture slots as well */
ParticleSettings *part = user->ptr.id.data;
int a;
for(a = 0; a < MAX_MTEX; a++)
if(user->ptr.data == part->mtex[a])
for (a = 0; a < MAX_MTEX; a++)
if (user->ptr.data == part->mtex[a])
part->texact = a;
}
}

2
source/blender/makesrna/intern/rna_space.c
View File

@ -540,7 +540,7 @@ static int rna_SpaceView3D_viewport_shade_get(PointerRNA *ptr)
{
Scene *scene = ((bScreen *)ptr->id.data)->scene;
RenderEngineType *type = RE_engines_find(scene->r.engine);
View3D *v3d= (View3D*)ptr->data;
View3D *v3d = (View3D *)ptr->data;
int drawtype = v3d->drawtype;
if (drawtype == OB_MATERIAL && !BKE_scene_use_new_shading_nodes(scene))