Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-23Merge remote-tracking branch 'origin/master' into soc-2014-fluidDaniel Genrich
Conflicts: .gitignore intern/cycles/CMakeLists.txt source/blender/blenkernel/intern/smoke.c source/blender/python/intern/bpy_interface.c source/creator/CMakeLists.txt
2014-10-08Ghost Context RefactorJason Wilkins
https://developer.blender.org/D643 Separates graphics context creation from window code in Ghost so that they can vary separately.
2014-09-12Fix scons leaving partially generated files when abortingSergey Sharybin
2014-09-08Attempt to fix compilation error on ubuntu linuxSergey Sharybin
2014-08-31Add sqlite3 dll's on windows.Martijn Berger
Fix T41144
2014-08-29Fix T41629: Won't open blend files with non-Latin charasters in the nameSergey Sharybin
2014-08-27Make SCons's DEBUG/_DEBUG consistent with CMakeSergey Sharybin
Also move this to a generic place in SConstruct instead of having this defines in 6 different configurations. Should not be functional changes, but please verify all the platforms.
2014-08-26Cycles: Add an experimental CUDA kernel.Thomas Dinges
Now we build 2 .cubins per architecture (e.g. kernel_sm_21.cubin, kernel_experimental_sm_21.cubin). The experimental kernel can be used by switching to the Experimental Feature Set: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Experimental_Features This enables Subsurface Scattering and Correlated Multi Jitter Sampling on GPU, while keeping the stability and performance of the regular kernel. Differential Revision: https://developer.blender.org/D762 Patch by Sergey and myself. Developer / Builder Note: CUDA Toolkit 6.5 is highly recommended for this, also note that building the experimental kernel requires a lot of system memory (~7-8GB).
2014-08-14OSX/Scons: make sure BF_OSL implies BF_LLVMJens Verwiebe
2014-08-11Manifest used to be installed on non-windows platformsSergey Sharybin
2014-08-07Add blender launcher application when building with MSVCSergey Sharybin
Main idea of this change is to make a small executable which will set OMP_WAIT_POLICY environment variable and then will launch blender itself. This is a teporary solution for the time being we'll have a more clear solution to high CPU usage with OpenMP when building with MSVC. Reviewers: campbellbarton, juicyfruit Reviewed By: juicyfruit Differential Revision: https://developer.blender.org/D717
2014-08-07change scons default to be visual studio 2013Martijn Berger
2014-08-05Deduplicate CUDA and OpenCL wranglersSergey Sharybin
For now it was mainly about OpenCL wrangler being duplicated between Cycles and Compositor, but with OpenSubdiv work those wranglers were gonna to be duplicated just once again. This commit makes it so Cycles and Compositor uses wranglers from this repositories: - https://github.com/CudaWrangler/cuew - https://github.com/OpenCLWrangler/clew This repositories are based on the wranglers we used before and they'll be likely continued maintaining by us plus some more players in the market. Pretty much straightforward change with some tricks in the CMake/SCons to make this libs being passed to the linker after all other libraries in order to make OpenSubdiv linked against those wranglers in the future. For those who're worrying about Cycles being less standalone, it's not truth, it's rather more flexible now and in the future different wranglers might be used in Cycles. For now it'll just mean those libs would need to be put into Cycles repository together with some other libs from Blender such as mikkspace. This is mainly platform maintenance commit, should not be any changes to the user space. Reviewers: juicyfruit, dingto, campbellbarton Reviewed By: juicyfruit, dingto, campbellbarton Differential Revision: https://developer.blender.org/D707
2014-08-03OSX/buildsystem: prepare usage on OSX 10.10 - YosemiteJens Verwiebe
- important: requires cmake >= 2.8.12 to read minor version right, aka older cmake rates 10.10 lower than 10.6 for example ! ( sigh )
2014-07-31Use dynamically linked SDL 1.2.15 on windows x64Martijn Berger
2014-07-29OSX/scons: Fix linking if llvm is not used ( new osl/llvm/oiio related )Jens Verwiebe
2014-07-21GSOC 2013 paintAntony Riakiotakis
Yep, at last it's here! There are a few minor issues remaining but development can go on in master after discussion at blender institute. For full list of features see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.72/Painting Thanks to Sergey and Campbell for the extensive review and to the countless artists that have given their input and reported issues during development.
2014-07-10Need to disable Libmv for cudakernels targetSergey Sharybin
This way no access to automated tests variables will happen. Ideally it should be something more like using blenderlite with just Cycles enabled, but let's keep it for a bigger clean up.
2014-07-10SCons: Hopefully final fix for 32bit linux buildbotSergey Sharybin
No need to run automated tests for cudakernels target. TThis could be harmless because CUDA binaries are built in the another chroot.
2014-07-10Further tweaks to SCons's auto testsSergey Sharybin
We should do autotests only after setting path to sconsign, otherwise using the same working directory and different build directories will eventually break.
2014-07-10Another attempt to fix issues with 32bit OSX and sconsSergey Sharybin
2014-07-06OSX/Scons: after doublechecking. take out sdk_flags from cflags again, looks ↵Jens Verwiebe
as we always get sdk properly fron ccflags in subcompiles
2014-07-06OSX/scons: Try to get rid of buildproblems with openjpeg enabled in certain ↵Jens Verwiebe
build environments and prepend SDK_FLAGS to CFLAGS always
2014-07-02*FAULTY* code, big commit: manta files, Cmake and Scons integration. Started ↵Roman Pogribnyi
work on full-cycle fluids
2014-06-29Fix compilation error on OSX+SconsSergey Sharybin
Issue was caused by OSX tweaks happening in the SConstruct after the old location of autotest.
2014-06-27Update Ceres to latest upstream versionSergey Sharybin
Brings new bounds limiting and also prepares build system for the changes in the upstream. Namely shared_ptr header and namespace is now being detected by a build system rather than by hacks in the code. This commit includes some changes to auto-detection flags in SCons, presumably adding more consistency there. This is main changes which are suppoed to be reviewed here. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D581
2014-06-26Fix compilation error with scons and older pythonsSergey Sharybin
2014-06-19Python: Remove deprecated uses of os.popenCampbell Barton
T40415 by Lawrence D'Oliveiro
2014-05-15CMake/SCons: finish removing MSVC2012 referencesCampbell Barton
2014-04-04Scons/cycles: fix header distribution for geomJens Verwiebe
2014-04-01Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT defineCampbell Barton
2014-02-18Splash screen: use a retina resolution image for Mac OS X.Brecht Van Lommel
2014-02-18OSX: more futurework for clang-openmp:Jens Verwiebe
- moved assumed location of omp lib to blender libs - prepared libiomp5 to link out of the box with cmake - changed according in scons - introduced a local var C_VENDOR, cause Apple clang 3.4 may not include omp support yet - added a linklibs for msgfmt ( may not be needed for other than OSX )
2014-02-10OSX/scons: adapt forgotten CCVERSION conditional, sorryJens Verwiebe
2014-02-10OSX/scons; Adapt ftemplate-depth=1024 condition to new compiler versioningJens Verwiebe
2014-02-10OSX/scons: fix breakage after clang-openmp commit:Jens Verwiebe
use the svn clang version instead of Apple compiler naming, this also makes Brecht’s cycles sse/avx conditionals behave right
2014-02-09OSX/scons: allow for compiling with clang-openmp-3.4Jens Verwiebe
See: http://clang-omp.github.io + fix a longstanding bad include in darwin-config
2014-02-04SCons: cleaner determination of 32-bit/64-bit buildsLawrence D'Oliveiro
Try not to be x86-centric, remove unneeded blenderdeps variable. Reviewed By: brecht Differential Revision: https://developer.blender.org/D240
2014-01-17Scons: Fix cycles OpenCL kernelcompile by distributing util_half.hJens Verwiebe
2014-01-15Cycles: Build SSE41 kernel per default, remove build option. This hopefully ↵Thomas Dinges
also fixes some compile errors on various systems.
2014-01-13UI Icons: store icons in git as uncompressed pixmaps (D196)Campbell Barton
this allows for updating icons without committing a new PNG each time (which is inefficient with git). The data files are converted into a PNG at builds time and used just as they were before.
2014-01-11Scons: disable player along with game-engine.Campbell Barton
2014-01-07OSX/scons: after discussion i was told cycles does decide to use sse4.1 ↵Jens Verwiebe
kernel on the fly, so autodetection is obsolete @buildtime. Leave in print for testing case
2014-01-07OSX/scons: autodetecting sse4.1 capability and set it to usedJens Verwiebe
2013-12-12Fix T37780: no languages in user preferences with SCons on Windows / Linux.Brecht Van Lommel
The "languages" file was not copied, probably this was not noticed earlier because it only affects clean builds.
2013-12-08Scons: as requested by Ideasman, make MACOSX_COMPILER -> C_COMPILER_ID,Jens Verwiebe
leave env set for OSX exclusive for now”
2013-12-07OSX/scons: forgot Intel CC ( ‘icc’ ) in detectionJens Verwiebe
Todo: perhaps unify this for all OS, but keep in mind: Apple compiler versions may have other capabilities than std gcc, llvm, clang ( other versioning also )
2013-12-06OSX/scons: Introduce a new env var 'MACOSX_COMPILER'Jens Verwiebe
This is needed to resolve the real used compiler from the compatibility shim’S or symlinks. Also set the real CCVERSION as scons CCVERSION would only read the default one, which is not useful for OSX
2013-12-05OSX/scons: fix misdesigned version detection of compiler ( todo: do with ↵Jens Verwiebe
submodule ), fix a compiler warning with clang < 5”
2013-11-28Update Ceres to latest upstream versionSergey Sharybin
- A richer Problem API. - DynamicNumericDiffCostFunction. - Faster ITERATIVE_SCHUR solver. - Faster SCHUR_JACOBI preconditioner. - Faster Jacobian evaluation. - Faster visibility based preconditioning using single linkage clustering. Also re-wrote rules for unordered collections detection, should work on all platforms and compilers now :)