graphics/blender: Update to 2.80

PR:		239589
Submitted by:	Shane <FreeBSD@ShaneWare.Biz> (maintainer)
Approved by:	tcberner (mentor)
This commit is contained in:
Alexandre C. Guimarães 2019-08-15 19:09:14 +00:00
parent d2b7f6e0ca
commit f91ce8a917
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=509044
15 changed files with 792 additions and 890 deletions

View file

@ -2,19 +2,19 @@
# $FreeBSD$
PORTNAME= blender
PORTVERSION= 2.79b
PORTREVISION= 14
CATEGORIES= graphics games
DISTVERSION= 2.80
CATEGORIES= graphics multimedia
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
http://public.planetmirror.com/pub/blender/source/
MAINTAINER= FreeBSD@Shaneware.biz
COMMENT= 3D modeling/rendering/animation/gaming package
COMMENT= 3D modeling/rendering/animation package
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/doc/license/GPL3-license.txt
BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libpng.so:graphics/png \
libfreetype.so:print/freetype2 \
libboost_regex.so:devel/boost-libs
@ -24,16 +24,16 @@ RUN_DEPENDS= ${PYNUMPY}
# libraries are used, if either of the most common options in blender
# are set. We will pull boost in just to be on the safe side.
# USES=compiler is needed to support gcc built archs
USES= cmake compiler:c++14-lang desktop-file-utils gl \
jpeg python:3.5 shebangfix
USES= cmake compiler:c++14-lang gl jpeg python:3.7 shebangfix
USE_XORG= x11 xext xfixes xmu xrender
USE_GL= gl glu glew
INSTALLS_ICONS= yes
# always enable c++11, this needs to be enabled for several options
CMAKE_ON= WITH_CXX11
CMAKE_OFF= WITH_PYTHON_INSTALL WITH_PYTHON_INSTALL_NUMPY \
WITH_INSTALL_PORTABLE WITH_CYCLES_LOGGING
CMAKE_OFF= WITH_IMAGE_OPENJPEG WITH_PYTHON_INSTALL \
WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
WITH_CYCLES_LOGGING
SHEBANG_FILES= release/bin/blender-thumbnailer.py \
release/scripts/modules/bl_i18n_utils/merge_po.py \
@ -44,7 +44,10 @@ CFLAGS_gcc= -Wno-float-conversion
CFLAGS_i386= -march=i586
CXXFLAGS_i386= -march=i586
PLIST_SUB+= VER=2.79
# version without trailing update letters
VERDIR= ${DISTVERSION:C/[abcdef]//g}
PLIST_SUB+= VER=${VERDIR}
LLVM_VER= 60
OPTIONS_SUB= yes
.include "${.CURDIR}/Makefile.options"
@ -79,18 +82,18 @@ CYCLES_CMAKE_BOOL= WITH_CYCLES
CYCLESOSL_IMPLIES= CYCLES
CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM
CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \
-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config60"
CYCLESOSL_BUILD_DEPENDS= llvm-config60:devel/llvm60
-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}"
CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage
CYCLESOSL_RUN_DEPENDS= llvm-config60:devel/llvm60
CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
DDS_CMAKE_BOOL= WITH_IMAGE_DDS
DRACO_CMAKE_BOOL= WITH_DRACO
FFMPEG_CMAKE_BOOL= WITH_CODEC_FFMPEG
FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg
FFTW3_CMAKE_BOOL= WITH_FFTW3
FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3
FRAMESERVER_CMAKE_BOOL= WITH_IMAGE_FRAMESERVER
FREESTYLE_CMAKE_BOOL= WITH_FREESTYLE
GAMEENGINE_CMAKE_BOOL= WITH_GAMEENGINE
HDR_CMAKE_BOOL= WITH_IMAGE_HDR
HEADLESS_PREVENTS= MENU XINPUT XF86VMODE
HEADLESS_PREVENTS_MSG= X11 options can't be used in headless mode
@ -124,19 +127,15 @@ OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \
OPENIMAGEIO_IMPLIES= OPENEXR TIFF
OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO
OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio
OPENJPEG_CMAKE_BOOL= WITH_SYSTEM_OPENJPEG WITH_IMAGE_OPENJPEG
OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
# openmp usually works on amd64
#OPENMP_CMAKE_ON= -DWITH_OPENMP:BOOL=ON \
# -DOpenMP_C_FLAGS:STRING=-fopenmp -lm \
# -DOpenMP_CXX_FLAGS:STRING=-fopenmp -lm
#OPENMP_CMAKE_OFF= -DWITH_OPENMP:BOOL=OFF
#OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
#OPENMP_LDFLAGS= -L${LOCALBASE}/lib
OPENMP_CMAKE_BOOL= WITH_OPENMP
OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV
OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv
PLAYER_IMPLIES= GAMEENGINE
PLAYER_CMAKE_BOOL= WITH_PLAYER
OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC
OPENVDB_LIB_DEPENDS= libblosc.so:archivers/c-blosc \
libopenvdb.so:misc/openvdb \
libtbb.so:devel/tbb
RAYOPTIMIZATION_CMAKE_BOOL= WITH_RAYOPTIMIZATION
SDL_CMAKE_BOOL= WITH_SDL
SDL_USE= SDL=sdl2
@ -164,11 +163,18 @@ post-build:
${INSTALL_WRKSRC}/bin/blender \
${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
post-install-MENU-on:
@-update-desktop-database -q
post-install:
${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
${STAGEDIR}${MAN1PREFIX}/man/man1
post-install-DRACO-on:
# move draco pylib into site-packages
${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
@${RM} -R ${STAGEDIR}/${PREFIX}/share/blender/${VERDIR}/python
post-install-MENU-on:
@-update-desktop-database -q
.include <bsd.port.mk>

View file

@ -12,11 +12,11 @@ OPTIONS_DEFINE= \
CYCLES \
CYCLESOSL \
DDS \
DRACO \
FFMPEG \
FFTW3 \
FRAMESERVER \
FREESTYLE \
GAMEENGINE \
HDR \
HEADLESS \
INPUT_NDOF \
@ -34,9 +34,9 @@ OPTIONS_DEFINE= \
OPENCOLORIO \
OPENEXR \
OPENIMAGEIO \
OPENJPEG \
OPENMP \
OPENSUBDIV \
PLAYER \
OPENVDB \
RAYOPTIMIZATION \
SDL \
SNDFILE \
@ -51,14 +51,15 @@ OPTIONS_DEFAULT= \
BULLET \
CAMERATRACK \
CINEON \
COLLADA \
COMPOSITOR \
CYCLES \
DDS \
DRACO \
FFMPEG \
FFTW3 \
FRAMESERVER \
FREESTYLE \
GAMEENGINE \
HDR \
INPUT_NDOF \
LZO \
@ -73,7 +74,8 @@ OPTIONS_DEFAULT= \
OPENCOLORIO \
OPENEXR \
OPENIMAGEIO \
OPENJPEG \
OPENSUBDIV \
OPENVDB \
RAYOPTIMIZATION \
SDL \
TIFF \
@ -91,10 +93,11 @@ COMPOSITOR_DESC= Use the tile-based nodal compositor
CYCLES_DESC= Cycles render engine support
CYCLESOSL_DESC= Shading support for the cycles render engine
DDS_DESC= DDS graphics format support
# this is required to supoprt gltf import/export
DRACO_DESC= Install draco python module
FFTW3_DESC= Use fftw for smoke and audio effects
FRAMESERVER_DESC= Image FrameServer support for rendering
FREESTYLE_DESC= Enable advanced edges rendering
GAMEENGINE_DESC= Enable the game engine
HDR_DESC= Generic high dynamic-range (HDR) support
HEADLESS_DESC= Disable user interface (for render-farms)
INPUT_NDOF_DESC= Enable NDOF input device support
@ -109,7 +112,7 @@ MOD_SMOKE_DESC= Smoke simulation support
OPENCOLORIO_DESC= OpenColorIO-based color management support
OPENIMAGEIO_DESC= OpenImageIO image processing support
OPENSUBDIV_DESC= Use the OpenSubDiv library for surface subdivision
PLAYER_DESC= Enable blender player
OPENVDB_DESC= Use openVDB library for volumetric data
RAYOPTIMIZATION_DESC= Enable SSE optimizatons for raytracing
SDL_DESC= Audio and Joystick support using SDL
XINPUT_DESC= X11 Xinput (tablet) support

View file

@ -2,5 +2,5 @@
# Versions of Blender and its python dependency for use by depending ports, like add-ons
BLENDER_BL_VERSION= 2.79
BLENDER_PY_VERSION= 3.5
BLENDER_BL_VERSION= 2.80
BLENDER_PY_VERSION= 3.7

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1523336334
SHA256 (blender-2.79b.tar.gz) = 4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc
SIZE (blender-2.79b.tar.gz) = 50204270
TIMESTAMP = 1564536941
SHA256 (blender-2.80.tar.gz) = cd9d7e505c1f6e63a4f72366ed04d446859977eeb34cde21283aaea6a304a5c0
SIZE (blender-2.80.tar.gz) = 54216321

View file

@ -0,0 +1,14 @@
--- CMakeLists.txt.orig 2019-07-31 13:12:04 UTC
+++ CMakeLists.txt
@@ -647,11 +647,6 @@ if(NOT WITH_PYTHON)
set(WITH_DRACO OFF)
endif()
-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
- set(WITH_DRACO OFF)
-endif()
-
# enable boost for cycles, audaspace or i18n
# otherwise if the user disabled
if(NOT WITH_BOOST)

View file

@ -1,107 +0,0 @@
https://git.archlinux.org/svntogit/community.git/tree/trunk/ffmpeg4.0.patch?h=packages/blender&id=059566c3ec72
--- intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp.orig 2017-09-12 03:44:17 UTC
+++ intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
@@ -264,9 +264,9 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr<A
m_membuffer(buffer),
m_membufferpos(0)
{
- m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE));
+ m_membuf = reinterpret_cast<data_t*>(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE));
- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this,
+ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this,
read_packet, NULL, seek_packet);
if(!m_aviocontext)
--- intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp.orig 2017-09-12 03:44:17 UTC
+++ intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filenam
try
{
if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER)
- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id);
if(!codec)
@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filenam
if(avcodec_open2(m_codecCtx, codec, NULL))
AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
- m_output_buffer.resize(FF_MIN_BUFFER_SIZE);
+ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE);
int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs));
if(m_codecCtx->frame_size <= 1) {
- m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
+ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
m_input_buffer.resize(m_input_size * samplesize);
}
else
--- source/blender/blenkernel/intern/writeffmpeg.c.orig 2017-09-12 03:44:17 UTC
+++ source/blender/blenkernel/intern/writeffmpeg.c
@@ -605,8 +605,6 @@ static AVStream *alloc_video_stream(FFMpegContext *con
c->rc_buffer_aggressivity = 1.0;
#endif
- c->me_method = ME_EPZS;
-
codec = avcodec_find_encoder(c->codec_id);
if (!codec)
return NULL;
@@ -668,14 +666,14 @@ static AVStream *alloc_video_stream(FFMpegContext *con
)
{
PRINT("Using global header\n");
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
}
/* Determine whether we are encoding interlaced material or not */
if (rd->mode & R_FIELDS) {
PRINT("Encoding interlaced video\n");
- c->flags |= CODEC_FLAG_INTERLACED_DCT;
- c->flags |= CODEC_FLAG_INTERLACED_ME;
+ c->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
+ c->flags |= AV_CODEC_FLAG_INTERLACED_ME;
}
/* xasp & yasp got float lately... */
@@ -764,7 +762,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *con
}
if (of->oformat->flags & AVFMT_GLOBALHEADER) {
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
}
set_ffmpeg_properties(rd, c, "audio", &opts);
@@ -783,14 +781,14 @@ static AVStream *alloc_audio_stream(FFMpegContext *con
st->codec->time_base.den = st->codec->sample_rate;
#ifndef FFMPEG_HAVE_ENCODE_AUDIO2
- context->audio_outbuf_size = FF_MIN_BUFFER_SIZE;
+ context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE;
#endif
if (c->frame_size == 0)
// used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD))
// not sure if that is needed anymore, so let's try out if there are any
// complaints regarding some ffmpeg versions users might have
- context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels;
+ context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels;
else {
context->audio_input_samples = c->frame_size;
#ifndef FFMPEG_HAVE_ENCODE_AUDIO2
--- source/blender/imbuf/intern/indexer.c.orig 2017-09-11 04:34:59 UTC
+++ source/blender/imbuf/intern/indexer.c
@@ -537,7 +537,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffm
av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0);
if (rv->of->flags & AVFMT_GLOBALHEADER) {
- rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
}
if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {

View file

@ -1,6 +1,6 @@
--- intern/cycles/CMakeLists.txt.orig 2018-03-08 03:18:11 UTC
--- intern/cycles/CMakeLists.txt.orig 2019-07-31 13:03:30 UTC
+++ intern/cycles/CMakeLists.txt
@@ -205,9 +205,9 @@ if(WITH_CYCLES_DEBUG)
@@ -260,9 +260,9 @@ if(WITH_CYCLES_DEBUG)
add_definitions(-DWITH_CYCLES_DEBUG)
endif()

View file

@ -1,11 +0,0 @@
--- intern/itasc/kdl/tree.hpp.orig 2016-07-25 09:36:50 UTC
+++ intern/itasc/kdl/tree.hpp
@@ -34,7 +34,7 @@
//Forward declaration
class TreeElement;
// Eigen allocator is needed for alignment of Eigen data types
- typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
+ typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
class TreeElement
{

View file

@ -1,11 +1,11 @@
--- intern/opensubdiv/CMakeLists.txt.orig 2017-09-13 04:49:03 UTC
--- intern/opensubdiv/CMakeLists.txt.orig 2019-07-24 17:11:39 UTC
+++ intern/opensubdiv/CMakeLists.txt
@@ -56,7 +56,7 @@ macro(OPENSUBDIV_DEFINE_COMPONENT compon
endif()
endmacro()
@@ -83,7 +83,7 @@ if(WITH_OPENSUBDIV)
internal/opensubdiv_util.h
)
-OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP)
+#OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP)
- OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP)
+# OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP)
# TODO(sergey): OpenCL is not tested and totally unstable atm.
# OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENCL)
# TODO(sergey): CUDA stays disabled for util it's ported to drievr API.

View file

@ -1,10 +0,0 @@
--- intern/opensubdiv/opensubdiv_converter.cc.orig 2015-11-02 13:25:37 UTC
+++ intern/opensubdiv/opensubdiv_converter.cc
@@ -24,6 +24,7 @@
*/
#include <cstdio>
+#include <cstdlib>
#include <vector>
#ifdef _MSC_VER

View file

@ -1,168 +0,0 @@
--- intern/cycles/kernel/shaders/node_brick_texture.osl.orig 2018-12-03 16:56:43 UTC
+++ intern/cycles/kernel/shaders/node_brick_texture.osl
@@ -19,10 +19,10 @@
/* Brick */
-float brick_noise(int n) /* fast integer noise */
+float brick_noise(int ns) /* fast integer noise */
{
int nn;
- n = (n + 1013) & 2147483647;
+ int n = (ns + 1013) & 2147483647;
n = (n >> 13) ^ n;
nn = (n * (n * n * 60493 + 19990303) + 1376312589) & 2147483647;
return 0.5 * ((float)nn / 1073741824.0);
@@ -30,7 +30,7 @@ float brick_noise(int n) /* fast integer noise */
float brick(point p, float mortar_size, float mortar_smooth, float bias,
float BrickWidth, float row_height, float offset_amount, int offset_frequency,
- float squash_amount, int squash_frequency, float tint)
+ float squash_amount, int squash_frequency, output float tint)
{
int bricknum, rownum;
float offset = 0.0;
--- intern/cycles/kernel/shaders/node_checker_texture.osl.orig 2018-12-03 16:56:43 UTC
+++ intern/cycles/kernel/shaders/node_checker_texture.osl
@@ -19,11 +19,12 @@
/* Checker */
-float checker(point p)
+float checker(point ip)
{
- p[0] = (p[0] + 0.000001) * 0.999999;
- p[1] = (p[1] + 0.000001) * 0.999999;
- p[2] = (p[2] + 0.000001) * 0.999999;
+ point p;
+ p[0] = (ip[0] + 0.000001) * 0.999999;
+ p[1] = (ip[1] + 0.000001) * 0.999999;
+ p[2] = (ip[2] + 0.000001) * 0.999999;
int xi = (int)fabs(floor(p[0]));
int yi = (int)fabs(floor(p[1]));
--- intern/cycles/kernel/shaders/node_environment_texture.osl.orig 2018-12-03 16:56:43 UTC
+++ intern/cycles/kernel/shaders/node_environment_texture.osl
@@ -25,8 +25,9 @@ vector environment_texture_direction_to_equirectangular(vector dir)
return vector(u, v, 0.0);
}
-vector environment_texture_direction_to_mirrorball(vector dir)
+vector environment_texture_direction_to_mirrorball(vector idir)
{
+ vector dir = idir;
dir[1] -= 1.0;
float div = 2.0 * sqrt(max(-0.5 * dir[1], 0.0));
--- intern/cycles/kernel/shaders/node_musgrave_texture.osl.orig 2018-12-03 16:56:43 UTC
+++ intern/cycles/kernel/shaders/node_musgrave_texture.osl
@@ -26,13 +26,14 @@
* from "Texturing and Modelling: A procedural approach"
*/
-float noise_musgrave_fBm(point p, float H, float lacunarity, float octaves)
+float noise_musgrave_fBm(point ip, float H, float lacunarity, float octaves)
{
float rmd;
float value = 0.0;
float pwr = 1.0;
float pwHL = pow(lacunarity, -H);
int i;
+ point p = ip;
for (i = 0; i < (int)octaves; i++) {
value += safe_noise(p, "signed") * pwr;
@@ -54,13 +55,14 @@ float noise_musgrave_fBm(point p, float H, float lacunarity, float octaves)
* octaves: number of frequencies in the fBm
*/
-float noise_musgrave_multi_fractal(point p, float H, float lacunarity, float octaves)
+float noise_musgrave_multi_fractal(point ip, float H, float lacunarity, float octaves)
{
float rmd;
float value = 1.0;
float pwr = 1.0;
float pwHL = pow(lacunarity, -H);
int i;
+ point p = ip;
for (i = 0; i < (int)octaves; i++) {
value *= (pwr * safe_noise(p, "signed") + 1.0);
@@ -83,12 +85,13 @@ float noise_musgrave_multi_fractal(point p, float H, float lacunarity, float oct
* offset: raises the terrain from `sea level'
*/
-float noise_musgrave_hetero_terrain(point p, float H, float lacunarity, float octaves, float offset)
+float noise_musgrave_hetero_terrain(point ip, float H, float lacunarity, float octaves, float offset)
{
float value, increment, rmd;
float pwHL = pow(lacunarity, -H);
float pwr = pwHL;
int i;
+ point p = ip;
/* first unscaled octave of function; later octaves are scaled */
value = offset + safe_noise(p, "signed");
@@ -118,13 +121,14 @@ float noise_musgrave_hetero_terrain(point p, float H, float lacunarity, float oc
* offset: raises the terrain from `sea level'
*/
-float noise_musgrave_hybrid_multi_fractal(point p, float H, float lacunarity,
+float noise_musgrave_hybrid_multi_fractal(point ip, float H, float lacunarity,
float octaves, float offset, float gain)
{
float result, signal, weight, rmd;
float pwHL = pow(lacunarity, -H);
float pwr = pwHL;
int i;
+ point p = ip;
result = safe_noise(p, "signed") + offset;
weight = gain * result;
@@ -156,13 +160,14 @@ float noise_musgrave_hybrid_multi_fractal(point p, float H, float lacunarity,
* offset: raises the terrain from `sea level'
*/
-float noise_musgrave_ridged_multi_fractal(point p, float H, float lacunarity,
+float noise_musgrave_ridged_multi_fractal(point ip, float H, float lacunarity,
float octaves, float offset, float gain)
{
float result, signal, weight;
float pwHL = pow(lacunarity, -H);
float pwr = pwHL;
int i;
+ point p = ip;
signal = offset - fabs(safe_noise(p, "signed"));
signal *= signal;
--- intern/cycles/kernel/shaders/node_noise_texture.osl.orig 2018-12-03 16:56:43 UTC
+++ intern/cycles/kernel/shaders/node_noise_texture.osl
@@ -19,9 +19,10 @@
/* Noise */
-float noise(point p, float distortion, float detail, float fac, color Color)
+float noise(point ip, float distortion, float detail, output color Color)
{
point r;
+ point p = ip;
int hard = 0;
if (distortion != 0.0) {
@@ -32,7 +33,7 @@ float noise(point p, float distortion, float detail, float fac, color Color)
p += r;
}
- fac = noise_turbulence(p, detail, hard);
+ float fac = noise_turbulence(p, detail, hard);
Color = color(fac, noise_turbulence(point(p[1], p[0], p[2]), detail, hard),
noise_turbulence(point(p[1], p[2], p[0]), detail, hard));
@@ -55,6 +56,6 @@ shader node_noise_texture(
if (use_mapping)
p = transform(mapping, p);
- Fac = noise(p * Scale, Distortion, Detail, Fac, Color);
+ Fac = noise(p * Scale, Distortion, Detail, Color);
}

View file

@ -0,0 +1,19 @@
--- release/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py.orig 2019-07-31 06:38:16 UTC
+++ release/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py
@@ -13,6 +13,7 @@
# limitations under the License.
import bpy
+import site
import sys
from ctypes import *
from pathlib import Path
@@ -35,7 +36,7 @@ def dll_path() -> Path:
'darwin': blender_root.parent/'Resources'/python_lib/'python3.7'/'site-packages'/'lib{}.dylib'.format(lib_name)
}
- path = paths.get(sys.platform)
+ path = Path('{}/lib{}.so'.format(site.getsitepackages(), lib_name))
return path if path is not None else ''

View file

@ -1,14 +0,0 @@
--- source/blender/collada/DocumentImporter.cpp.orig 2018-12-03 07:38:07 UTC
+++ source/blender/collada/DocumentImporter.cpp
@@ -1340,6 +1340,11 @@ bool DocumentImporter::writeAnimationLis
return anim_importer.write_animation_list(animationList);
}
+bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip)
+{
+ return true;
+}
+
/** When this method is called, the writer must write the skin controller data.
* \return The writer should return true, if writing succeeded, false otherwise.*/
bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin)

View file

@ -1,11 +0,0 @@
--- source/blender/collada/DocumentImporter.h.orig 2018-12-03 07:38:12 UTC
+++ source/blender/collada/DocumentImporter.h
@@ -107,6 +107,8 @@ public:
bool writeAnimation(const COLLADAFW::Animation*);
bool writeAnimationList(const COLLADAFW::AnimationList*);
+
+ bool writeAnimationClip( const COLLADAFW::AnimationClip* );
bool writeGeometry(const COLLADAFW::Geometry*);

File diff suppressed because it is too large Load diff