Age | Commit message (Collapse) | Author | |
---|---|---|---|
2015-07-27 | Gooseberry: Fixes for buildbot ported from mastergooseberry | Sergey 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-27 | Gooseberry: Correction for previous OpenVDB fix | Sergey Sharybin | |
Flag was set back to front. | |||
2015-07-27 | Gooseberry: Disable OpenVDB for windows cmake | Sergey Sharybin | |
We don't have precompiled libraries for openvdb on windows so compilation on buildbots was completely failing. | |||
2015-07-18 | Gooseberry: Disable CUDA kernels from buildbot compilation | Sergey 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-01 | Merge branch 'master' into gooseberry | Antony 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-30 | CMake: minor edits | Campbell Barton | |
2015-06-29 | GTests: do not add 'performance' tests to auto-ran tests (with ctest or ↵ | Bastien Montagne | |
'make test')... | |||
2015-06-25 | Merge branch 'master' into gooseberry | Antony Riakiotakis | |
Conflicts: source/blender/blenkernel/intern/cdderivedmesh.c source/blender/makesrna/intern/rna_nodetree.c | |||
2015-06-23 | CMake: quiet warnings in GTest | Campbell Barton | |
2015-06-23 | CMake: support multiple args to remove_cc_flag | Campbell Barton | |
2015-06-20 | SCons: Enable sm_52 CUDA kernel on all platforms | Sergey Sharybin | |
2015-06-20 | support ninja for netbeans projects | Campbell Barton | |
2015-06-19 | SCons: Fix missing file in kernel when building on OSX | Sergey Sharybin | |
2015-06-19 | SCons: Another attempt to fix bundling on OSX | Sergey Sharybin | |
2015-06-19 | SCons: Fix wrong bunding of Cycles kernel on OSX platform | Sergey Sharybin | |
2015-06-18 | Update netbeans project file generator | Campbell Barton | |
2015-06-17 | CMake: use parent scope setting cflags in funcion | Campbell Barton | |
2015-06-17 | Revert "Correct recent commit replacing macro's /w MSVC" | Campbell Barton | |
This reverts commit 810f8928d65abbce6dddc1e11f6092c22d9a5fcc. Worked by accident with MSVC, real fix next... | |||
2015-06-17 | Merge branch 'master' into gooseberry | Antony Riakiotakis | |
Conflicts: source/blender/blenkernel/intern/cdderivedmesh.c source/blender/gpu/GPU_buffers.h source/blender/physics/intern/BPH_mass_spring.cpp | |||
2015-06-17 | Correct recent commit replacing macro's /w MSVC | Campbell Barton | |
2015-06-17 | CMake: use functions instead of macros | Campbell Barton | |
Reduces issues with vars leaking into the parent scope. | |||
2015-06-15 | Merge branch 'master' into gooseberry | Antony Riakiotakis | |
2015-06-14 | CMake: minor edits to lite config | Campbell Barton | |
2015-06-11 | Disable OpenVDB on buildbots for OSX and Windows, until libraries for | Lukas Tönne | |
these environments are available. | |||
2015-06-11 | Merge branch 'openvdb' into gooseberry | Lukas 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-11 | Merge branch 'master' into gooseberry | Lukas Tönne | |
Conflicts: source/blender/blenkernel/intern/idcode.c source/blender/editors/interface/interface_templates.c | |||
2015-06-11 | Merge branch 'master' into openvdb | Lukas Tönne | |
2015-06-10 | OpenVDB: Disable it for blenderplayer buildbot target | Sergey Sharybin | |
2015-06-10 | OpenVDB: Tweaksfor scons and buildbot | Sergey Sharybin | |
2015-06-10 | CMake: Fix typo in OIIO module | Sergey Sharybin | |
2015-06-09 | Merge branch 'master' into openvdb | Kévin Dietrich | |
2015-06-08 | Merge branch 'master' into gooseberry | Bastien Montagne | |
Conflicts: source/blender/blenkernel/intern/key.c source/blender/blenlib/intern/path_util.c source/blender/editors/object/object_shapekey.c | |||
2015-06-07 | Cleanup: pep8 | Campbell Barton | |
2015-06-04 | Merge branch 'master' into gooseberry | Lukas Tönne | |
Conflicts: intern/cycles/kernel/svm/svm.h | |||
2015-06-01 | Merge branch 'master' into openvdb_smoke | Kévin Dietrich | |
2015-05-30 | python 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-29 | Merge branch 'master' into gooseberry | Antony Riakiotakis | |
2015-05-29 | Merge branch 'master' into openvdb_smoke | Kévin Dietrich | |
2015-05-28 | Install_deps: fix different 'libfreetype2' devel package name on fedora and ↵ | Bastien Montagne | |
suse... *sigh* | |||
2015-05-23 | Merge branch 'master' into openvdb_smoke | Kévin Dietrich | |
2015-05-23 | Move source/blender/openvdb folder to intern/openvdb | Kévin Dietrich | |
2015-05-22 | Expose 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-19 | Merge branch 'master' into gooseberry | Antony Riakiotakis | |
Conflicts: source/blender/windowmanager/intern/wm_playanim.c | |||
2015-05-19 | SCons: install Python executable when its bundled | Campbell Barton | |
2015-05-19 | CMake: install Python executable when its bundled | Campbell Barton | |
2015-05-19 | CMake: remove temp assignment, unused vars | Campbell Barton | |
2015-05-18 | WIP patch for OpenVDB integration in Blender and Cycles | Ké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-18 | Support compilation with SCons (only tested on Linux). | Kévin Dietrich | |
2015-05-17 | Improvements to compilation with CMake: set flags to be able to build | Kévin Dietrich | |
with or without OpenVDB. Scons support should follow. | |||
2015-05-17 | Buildbot: Make sure files are readable by www group | Sergey Sharybin | |