forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
Conflicts: source/blender/modifiers/intern/MOD_dynamicpaint.c source/blender/modifiers/intern/MOD_uvproject.c
This commit is contained in:
commit
43be434310
@ -119,6 +119,45 @@ int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt)
|
||||
|
||||
#endif
|
||||
|
||||
/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though,
|
||||
* so for now this will do. */
|
||||
|
||||
#ifndef FF_MIN_BUFFER_SIZE
|
||||
# ifdef AV_INPUT_BUFFER_MIN_SIZE
|
||||
# define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef FF_INPUT_BUFFER_PADDING_SIZE
|
||||
# ifdef AV_INPUT_BUFFER_PADDING_SIZE
|
||||
# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef CODEC_FLAG_GLOBAL_HEADER
|
||||
# ifdef AV_CODEC_FLAG_GLOBAL_HEADER
|
||||
# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef CODEC_FLAG_GLOBAL_HEADER
|
||||
# ifdef AV_CODEC_FLAG_GLOBAL_HEADER
|
||||
# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef CODEC_FLAG_INTERLACED_DCT
|
||||
# ifdef AV_CODEC_FLAG_INTERLACED_DCT
|
||||
# define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef CODEC_FLAG_INTERLACED_ME
|
||||
# ifdef AV_CODEC_FLAG_INTERLACED_ME
|
||||
# define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* FFmpeg upstream 1.0 is the first who added AV_ prefix. */
|
||||
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100)
|
||||
# define AV_CODEC_ID_NONE CODEC_ID_NONE
|
||||
|
@ -615,7 +615,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
|
||||
c->rc_buffer_aggressivity = 1.0;
|
||||
#endif
|
||||
|
||||
c->me_method = ME_EPZS;
|
||||
/* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */
|
||||
//c->me_method = ME_EPZS;
|
||||
|
||||
codec = avcodec_find_encoder(c->codec_id);
|
||||
if (!codec)
|
||||
|
@ -62,12 +62,6 @@ static void copyData(const ModifierData *md, ModifierData *target)
|
||||
DynamicPaintModifierData *tpmd = (DynamicPaintModifierData *)target;
|
||||
|
||||
dynamicPaint_Modifier_copy(pmd, tpmd);
|
||||
|
||||
if (tpmd->canvas) {
|
||||
for (DynamicPaintSurface *surface = tpmd->canvas->surfaces.first; surface; surface = surface->next) {
|
||||
id_us_plus((ID *)surface->init_texture);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void freeData(ModifierData *md)
|
||||
|
@ -64,9 +64,6 @@ static void copyData(const ModifierData *md, ModifierData *target)
|
||||
|
||||
modifier_copyData_generic(md, target);
|
||||
|
||||
if (tmcmd->cache_file) {
|
||||
id_us_plus(&tmcmd->cache_file->id);
|
||||
}
|
||||
tmcmd->reader = NULL;
|
||||
}
|
||||
|
||||
|
@ -67,16 +67,6 @@ static void initData(ModifierData *md)
|
||||
umd->scalex = umd->scaley = 1.0f;
|
||||
}
|
||||
|
||||
static void copyData(const ModifierData *md, ModifierData *target)
|
||||
{
|
||||
#if 0
|
||||
const UVProjectModifierData *umd = (const UVProjectModifierData *) md;
|
||||
UVProjectModifierData *tumd = (UVProjectModifierData *) target;
|
||||
#endif
|
||||
|
||||
modifier_copyData_generic(md, target);
|
||||
}
|
||||
|
||||
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md))
|
||||
{
|
||||
CustomDataMask dataMask = 0;
|
||||
@ -338,7 +328,7 @@ ModifierTypeInfo modifierType_UVProject = {
|
||||
eModifierTypeFlag_SupportsEditmode |
|
||||
eModifierTypeFlag_EnableInEditmode,
|
||||
|
||||
/* copyData */ copyData,
|
||||
/* copyData */ modifier_copyData_generic,
|
||||
|
||||
/* deformVerts_DM */ NULL,
|
||||
/* deformMatrices_DM */ NULL,
|
||||
|
Loading…
Reference in New Issue
Block a user