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
2015-07-27Gooseberry: Fixes for buildbot ported from mastergooseberrySergey Sharybin
Cherry-picking the changes because at this point it becomes quite tricky to merge master into gooseberry and it's maybe not something we really want to keep this branch being able to fully re-render the movie.
2015-07-27Gooseberry: Correction for previous OpenVDB fixSergey Sharybin
Flag was set back to front.
2015-07-27Gooseberry: Disable OpenVDB for windows cmakeSergey Sharybin
We don't have precompiled libraries for openvdb on windows so compilation on buildbots was completely failing.
2015-07-18Gooseberry: Disable CUDA kernels from buildbot compilationSergey Sharybin
OpenVDB kernel caused increase stress on the registers, which is now causing compiler to crash for quite some time now. Don't have time to look into details now and would prefer if the branch devs will look into this. Disabling CUDA for now, building without it is better than bot building at all anyway.
2015-07-01Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenlib/intern/BLI_filelist.c source/blender/editors/transform/transform.h source/blender/editors/transform/transform_snap.c source/blenderplayer/bad_level_call_stubs/stubs.c
2015-06-30CMake: minor editsCampbell Barton
2015-06-29GTests: do not add 'performance' tests to auto-ran tests (with ctest or ↵Bastien Montagne
'make test')...
2015-06-25Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenkernel/intern/cdderivedmesh.c source/blender/makesrna/intern/rna_nodetree.c
2015-06-23CMake: quiet warnings in GTestCampbell Barton
2015-06-23CMake: support multiple args to remove_cc_flagCampbell Barton
2015-06-20SCons: Enable sm_52 CUDA kernel on all platformsSergey Sharybin
2015-06-20support ninja for netbeans projectsCampbell Barton
2015-06-19SCons: Fix missing file in kernel when building on OSXSergey Sharybin
2015-06-19SCons: Another attempt to fix bundling on OSXSergey Sharybin
2015-06-19SCons: Fix wrong bunding of Cycles kernel on OSX platformSergey Sharybin
2015-06-18Update netbeans project file generatorCampbell Barton
2015-06-17CMake: use parent scope setting cflags in funcionCampbell Barton
2015-06-17Revert "Correct recent commit replacing macro's /w MSVC"Campbell Barton
This reverts commit 810f8928d65abbce6dddc1e11f6092c22d9a5fcc. Worked by accident with MSVC, real fix next...
2015-06-17Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenkernel/intern/cdderivedmesh.c source/blender/gpu/GPU_buffers.h source/blender/physics/intern/BPH_mass_spring.cpp
2015-06-17Correct recent commit replacing macro's /w MSVCCampbell Barton
2015-06-17CMake: use functions instead of macrosCampbell Barton
Reduces issues with vars leaking into the parent scope.
2015-06-15Merge branch 'master' into gooseberryAntony Riakiotakis
2015-06-14CMake: minor edits to lite configCampbell Barton
2015-06-11Disable OpenVDB on buildbots for OSX and Windows, until libraries forLukas Tönne
these environments are available.
2015-06-11Merge branch 'openvdb' into gooseberryLukas Tönne
Conflicts: build_files/buildbot/config/user-config-player-glibc211-i686.py build_files/buildbot/config/user-config-player-glibc211-x86_64.py build_files/scons/tools/Blender.py intern/cycles/blender/blender_shader.cpp intern/cycles/kernel/svm/svm_types.h source/blender/blenkernel/BKE_node.h source/blender/blenkernel/intern/smoke.c source/blender/makesdna/DNA_smoke_types.h source/blender/makesrna/intern/rna_nodetree.c source/blender/makesrna/intern/rna_smoke.c
2015-06-11Merge branch 'master' into gooseberryLukas Tönne
Conflicts: source/blender/blenkernel/intern/idcode.c source/blender/editors/interface/interface_templates.c
2015-06-11Merge branch 'master' into openvdbLukas Tönne
2015-06-10OpenVDB: Disable it for blenderplayer buildbot targetSergey Sharybin
2015-06-10OpenVDB: Tweaksfor scons and buildbotSergey Sharybin
2015-06-10CMake: Fix typo in OIIO moduleSergey Sharybin
2015-06-09Merge branch 'master' into openvdbKévin Dietrich
2015-06-08Merge branch 'master' into gooseberryBastien Montagne
Conflicts: source/blender/blenkernel/intern/key.c source/blender/blenlib/intern/path_util.c source/blender/editors/object/object_shapekey.c
2015-06-07Cleanup: pep8Campbell Barton
2015-06-04Merge branch 'master' into gooseberryLukas Tönne
Conflicts: intern/cycles/kernel/svm/svm.h
2015-06-01Merge branch 'master' into openvdb_smokeKévin Dietrich
2015-05-30python tar.gz changed structure due to python.exe being added. remove /lib/ ↵Martijn Berger
from cmake as lib and bin are both in the tar.gz
2015-05-29Merge branch 'master' into gooseberryAntony Riakiotakis
2015-05-29Merge branch 'master' into openvdb_smokeKévin Dietrich
2015-05-28Install_deps: fix different 'libfreetype2' devel package name on fedora and ↵Bastien Montagne
suse... *sigh*
2015-05-23Merge branch 'master' into openvdb_smokeKévin Dietrich
2015-05-23Move source/blender/openvdb folder to intern/openvdbKévin Dietrich
2015-05-22Expose file compression types.Kévin Dietrich
By default files are compressed based on their active values, with zip compression optionnaly added to it. We can as an option, enable blosc compression, through a build flags. This flag is only to be enbaled if OpenVDB was built with blosc. Otherwise -> crash.
2015-05-19Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/windowmanager/intern/wm_playanim.c
2015-05-19SCons: install Python executable when its bundledCampbell Barton
2015-05-19CMake: install Python executable when its bundledCampbell Barton
2015-05-19CMake: remove temp assignment, unused varsCampbell Barton
2015-05-18WIP patch for OpenVDB integration in Blender and CyclesKévin Dietrich
As requested by a handfull, here's some code :) (NOTE:) you'll need to disable compilation with OSL and install OpenVDB separately. Reviewers: dingto, lukastoenne, sergey Subscribers: levon, #cycles Differential Revision: https://developer.blender.org/D1308
2015-05-18Support compilation with SCons (only tested on Linux).Kévin Dietrich
2015-05-17Improvements to compilation with CMake: set flags to be able to buildKévin Dietrich
with or without OpenVDB. Scons support should follow.
2015-05-17Buildbot: Make sure files are readable by www groupSergey Sharybin