Age | Commit message (Collapse) | Author |
|
added to cycles standalone too.
|
|
* Standalone can now be compiled without the GUI, making the glut dependency optional.
Added WITH_CYCLES_STANDALONE_GUI cmake flag.
|
|
|
|
* Rename test to standalone.
Note: New CMAKE flag is WITH_CYCLES_STANDALONE.
|
|
args in more places.
|
|
|
|
|
|
|
|
system include.
|
|
options. This code was very old and not used. For example web player code, look at Burster.
|
|
using
a compiler older than CUDA 5.0 it will give a warning and skip this architecture.
|
|
|
|
|
|
* Remove vc2010 support from cmake.
There is some "if(MSVC10)" left in extern - ceres, but will leave that for Sergey. :)
|
|
- script execution is off by default
- if a blend file attempts to execute a script
this shows a message in the header with the action
that was suppressed (script/driver/game-autostart) and 2 buttons to either reload the file trusted, or to ignore the message.
- the file selector will always default to use the trust setting in the user preferences,
but reloading an open file will keep using the current setting (whatever was set before or set on the command-line).
- added SCons setting WITH_BF_PYTHON_SECURITY, this sets the default state for the user prefereces not to trust blend files on load.
... this option was in CMake before, but always off, now its enabled by default for SCons and CMake, and forced on in CMake for now.
|
|
is known to give crashes.
|
|
Crash was happening on windows platforms only and was caused
by some specifics about how CRT works.
Basically, blender and all of the .dll are compiled with /MT
flag, which means blender.exe and all .dll are using separate
environments. This makes it impossible to pass file descriptors
from blender to other dll, because it becomes invalid in the dll.
And this is exactly what was happening: OIIO was trying to open
movie file with all known plugins and one of them was zlib. And
the way OIIO was using zlib API is opening the file using Boost
and passing a file descriptor to zlib. And since zlib was a
dynamic library this lead to general issues using this descriptor
in zlib code.
Solved by linking to zlib statically. This allows to safely pass
file descriptor to zlib API. Alternative would be to compile all
the stuff with /MD flag, but that's much bigger and less robust
way to fix the issue.
Tested on windows using msvc2008, scons plus cmake both 32 and 64
bit versions. Seems to be working fine.
Further tweaks for mingw and msvc2012 could be needed tho.
|
|
|
|
single cflags can be added manually and don't need their own options.
|
|
Because of crashing issue with old Creative Labs OpenAL on Windows 8 x64.
|
|
- Extending CMakeLists.txt to support builds with VC2012.
- Fix some typo in CMakeLists.txt
- Introduces experimental WITH_AVX_CPU to build with /arch:AVX (VC11 only)
|
|
since guardedalloc confuses them.
The option cases a warning on build, since its ownly for experimental
use.
|
|
do via the objects.
|
|
|
|
trouble. Also fixed a few harmless warnings.
|
|
LLVM dynamically. Patch by Dan Eicher.
|
|
|
|
Also, add appropriate lib paths for recent OpenCollada for mingw32 (coming soon to an svn server near you)
|
|
now builds with opencollada
|
|
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
|
|
platforms might want to update as well)
|
|
|
|
Boost-Cycles-OIIO order
The NOT BOOST test was changing Cycles so should be before the
cycles-oiio link (by Campbell Barton, thanks)
And exr and tiff are required for oiio (on OSX at least)
|
|
Added new build option WITH_JACK_DYNLOAD for CMake and
WITH_BF_JACK_DYNLOAD for SCons, which means there'll be
no build-time linking against libjack and getting symbols
from libjack will happen runtime using dlopen and dlsym
tricks.
Alternative would be to use weak linking, but it'll require
having wrapper for preloading libjack.
This new options are disabled by default and they only
intended to be used on linux. Other platforms shall not
be using this and there shall be no functional changes
on non-linux platforms at all.
|
|
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript
Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
|
|
|
|
|
|
-Wredundant-decls is giving 1000s of lines of warnings for every file...
|
|
Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c
Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.
|
|
- without python builds without warnings.
- replace MAXFLOAT -> FLT_MAX in some areas, MAXFLOAT overflows (lager then float range).
- add cmake option WITH_GCC_MUDFLAP to enable libmudflap use.
|
|
|
|
|
|
which have been removed.
|
|
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
|
|
to include a few more that gcc is using too.
|
|
|
|
you make static builds!), and add it as CMake option.
Patch by gdh (Gavin Howard), many thanks!
|
|
This option allow Blender to be linked against the Framework python
It's useful if you want to have blenderplayer and bpy in the same application and need to avoid PyThread problems.
patch reviewed by Jens Verwiebe before 2.66. He may want to change something though.
(also small: I changed:
/Library/Frameworks/Python.framework/Versions//python
by
/Library/Frameworks/Python.framework/Versions//Python
as the latter seems to be the norm)
|
|
* Deprecate computing capability 1.3 (sm_13)
This commit disables auto build of sm_13 CUDA platform, which means that starting with Blender 2.67, we don't support sm_13 devices anymore. It has become difficult to support that and it was already feature incomplete (no render-passes, AO, Multi Closure etc).
It's still possible to manually enable sm_13 for own tests, but building might break in the future.
|
|
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
|