Commit Graph

471 Commits

Author SHA1 Message Date
Jens Verwiebe
74ae93d1cd Scons: Fix cycles OpenCL kernelcompile by distributing util_half.h 2014-01-17 00:33:32 +01:00
Thomas Dinges
5d88f7c7db Cycles: Build SSE41 kernel per default, remove build option. This hopefully also fixes some compile errors on various systems. 2014-01-14 22:04:32 +01:00
Campbell Barton
4c9a3a53bd UI Icons: store icons in git as uncompressed pixmaps (D196)
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-14 00:14:03 +11:00
Campbell Barton
3072d817d8 Scons: disable player along with game-engine. 2014-01-11 14:55:56 +11:00
Jens Verwiebe
17a4ba2c7c OSX/scons: after discussion i was told cycles does decide to use sse4.1 kernel on the fly,
so autodetection is obsolete @buildtime. Leave in print for testing case
2014-01-06 23:29:21 +01:00
Jens Verwiebe
d21ef02e8f OSX/scons: autodetecting sse4.1 capability and set it to used 2014-01-06 22:46:20 +01:00
6eedddc12d Fix T37780: no languages in user preferences with SCons on Windows / Linux.
The "languages" file was not copied, probably this was not noticed earlier
because it only affects clean builds.
2013-12-12 06:09:58 +01:00
Jens Verwiebe
901ebbd94a Scons: as requested by Ideasman, make MACOSX_COMPILER -> C_COMPILER_ID,
leave env set for OSX exclusive for now”
2013-12-08 15:35:21 +01:00
Jens Verwiebe
31871c763f OSX/scons: forgot Intel CC ( ‘icc’ ) in detection
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-07 18:05:27 +01:00
Jens Verwiebe
c167d7b79a OSX/scons: Introduce a new env var 'MACOSX_COMPILER'
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-06 17:06:51 +01:00
Jens Verwiebe
df2f604af2 OSX/scons: fix misdesigned version detection of compiler ( todo: do with submodule ), fix a compiler warning with clang < 5” 2013-12-04 23:15:29 +01:00
Sergey Sharybin
de6c1c9287 Update Ceres to latest upstream version
- 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 :)
2013-11-28 19:46:23 +06:00
Campbell Barton
2b4c68b902 CMake Build: option to compile without opennl/superlu. 2013-11-25 15:36:19 +11:00
Sergey Sharybin
891a037e9b Skip .git files from submodules for install targets
Also removed .svn checks when it's not longer needed.
Some further tweaks (probably for OSX bundler) are
likely needed.
2013-11-17 00:18:21 +06:00
Sergey Sharybin
9c3586d9f9 Remove check for whether po folder exist
It was just a temp thing to not break stuff
before final git migration.
2013-11-17 00:09:03 +06:00
Jens Verwiebe
92f3fa3fcd OSX/scons: make another gcc conditional futureproof 2013-11-15 15:44:29 +01:00
Jens Verwiebe
8c256de959 OSX/scons: user request, make options succes transparent by printing it 2013-11-09 16:32:10 +00:00
Jens Verwiebe
7d3698e26c OSX/scons: spelling and cleanup comments 2013-11-09 16:00:08 +00:00
Jens Verwiebe
9fd03c1354 OSX/scons: Only cosmetical, a nicer formatting for available sdk listing 2013-11-09 13:31:20 +00:00
Sergey Sharybin
ac6d91b939 Be ready for changes in bf-translations repository
Made it so if there's release/datafiles/locale/po
folder, then all the .po files will be converted
to .mo at blender compile time and installed to
an appropriate location.

Uses small own implementation msgfmt which is
based on msgfmt.py from Python project, but also
supports contexts.

There's no functional changes for until we've
switched to use source .po files instead of
pre-compiled .mo.

P.S. Well, there's one change which is msgfmt.cc
     being compiled even if it's not used, but
     would rather not clutter code with checks
     since pretty soon we'll use this program
     anyway.
2013-11-08 20:44:48 +00:00
Jens Verwiebe
a3ec6edc05 OSX/scons: make MACOSX_SDK_CHECK a local var is sconstruct and remove from env, also fix a longstanding misuse of MACOSX_SDK_CHECK in ceres, use MACOSX_SDK instead 2013-11-08 13:44:10 +00:00
Jens Verwiebe
8a717f8326 OSX/scons: remove never used MAC_PROC and minor cleanups 2013-11-08 13:19:51 +00:00
Jens Verwiebe
e572a433a8 OSX/scons: make gcc version detection more futureproof 2013-11-07 15:05:59 +00:00
Jens Verwiebe
4c009dfe85 OSX/scons: some cleanups 2013-11-07 14:06:21 +00:00
Jens Verwiebe
463b65bf0a OSX/scons: ARCH_FLAGS where not prperly added to CPPFLAGS 2013-11-07 13:56:40 +00:00
Jens Verwiebe
ec470d731e OSX/scons: for completeness, added WITH_BF_OPENMP switch 2013-11-06 23:19:01 +00:00
Jens Verwiebe
f392ebd77e OSX/scons: huge change, now you can set a user-config.py just with the desired variables changed 2013-11-06 20:59:04 +00:00
Brecht Van Lommel
99c5e71397 Quicktime: remove backend with the old quicktime API, and keep the QTKit backend.
This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled,
it will always use QTKit.

The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will
give consistent input/output. On Windows or Linux quicktime isn't being used.
2013-11-06 01:45:15 +00:00
Jens Verwiebe
78d8a14174 OSX: complety remove the cocoa options, definitions and conditionals now 2013-11-05 15:37:59 +00:00
Jens Verwiebe
0fe221c951 OSX/scons: clean message 2013-10-12 15:31:53 +00:00
Jens Verwiebe
fb068028b9 OSX/scons: rename a confusing (outdated) message 2013-10-12 15:25:31 +00:00
Jens Verwiebe
c742bc266a OSX/scons: change again conditional for ftemplate, it can be ambigous with xcode5, cause there is still gcc and llvm-gcc symlinks to clang, so env['CXX'] is bad test then 2013-10-11 22:37:24 +00:00
Sergey Sharybin
6e1fe4ddd9 Implementation of curve mapping in GLSL
The title says it all, now having curve mapping
enabled in color management settings wouldn't
force fallback from GLSL to CPU based color space
conversion.
2013-10-09 15:57:32 +00:00
Dalai Felinto
4abb8fde95 Photoshop PSD support
We now support the combined layer of Photoshop files (stored as layer 0
in the file). This way users can keep their files as multilayer PSD and
Blender always handle them as flat images.

For perfect alpha this requires an OpenImageIO update:
342cc2633f

Photoshop sample files:
https://github.com/OpenImageIO/oiio-images

Brecht has some pending fixes to push for OIIO as well, so we may as
well wait to update our libraries.

What works:
===========
* 8bit images (with or without alpha)
* 16bits images (alpha discarded)
* Photoshop files saved with 'Maximum Compatibility'
* Cycles, Blender internal,  BGE (and player)

Known limitations
(due to OIIO dependency):
=========================
* Images with less than 4 channels show a wrong thumbnail (bug may be in  OIIO)
* Packed images are not supported
* We do not write PSD files.

Note: old Blenders have support for PSD via Quicktime library. But due
to license issues this was discontinued.

Many thanks for Brecht van Lommel for reviewing the patch, suggesting
multiple improvements and to help solving the alpha issue.
2013-10-08 21:17:24 +00:00
Jens Verwiebe
f418097bc6 OSX/Scons/OMP: 1. Allow for compile with gnu gcc 4.8.1, 2. fix compiling with sdk > 10.7 by using libgomp dynamic, which includes proper errorhandling vs. static. Before xtra linking to system libstdc++.6.dylib was needed, which then caused incompatibilities 2013-09-28 18:42:14 +00:00
Irie Shinsuke
e9859bb0e5 Don't install LICENSE-bmonofont-i18n.ttf.txt unless international fonts are enabled. 2013-09-25 19:18:28 +00:00
Sergey Sharybin
8917e63134 Add font licenses to installation files
So now release archive will have this files included.
2013-09-25 08:35:43 +00:00
Jens Verwiebe
5b95903c82 OSX/scons: fix a typo for jack adding frameworksearchpath 2013-09-10 18:40:07 +00:00
Jens Verwiebe
6fc159bcff OSX/Scons/clang: more restrict the ftemplate fix to clang bundled with xcode 5 only 2013-09-10 12:55:36 +00:00
Jens Verwiebe
97e823488c OSX/Scons/clang: restrict the ftemplate fix to clang only 2013-09-10 12:31:21 +00:00
Jürgen Herrmann
836b91c9c7 Scons and BuildBot changes for MSVC 2012 support.
Thanks Brecht and Thomas for reviewing ;)
2013-06-18 11:55:32 +00:00
Nathan Letwory
f351bcca17 Since upgrade to SCons 2.3.0 a small change is needed to ensure 32bit is targeted properly when
building 32bit Blender with 64bit compiler installed as well (MSVC).
2013-06-16 20:34:29 +00:00
Nathan Letwory
fc4f6a7bad Set up OurSpawn for MinGW compile environment on Windows. 2013-06-15 21:20:06 +00:00
Sergey Sharybin
732c566f2f Fix #35587: Cycles: image movie to single image crashing
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.
2013-06-02 15:02:17 +00:00
Tamito Kajiyama
385c72f5f2 Merged changes in the trunk up to revision 55546.
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.
2013-03-24 12:13:13 +00:00
Tamito Kajiyama
c1ceab1281 Merged changes in the trunk up to revision 55357.
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.
2013-03-18 00:48:59 +00:00
Brecht Van Lommel
9fe858264c OpenGL: more work on fixed function lighting implementation as GLSL.
* Rename functions and move to own header.
* Add wrapper functions for glLight.
* Auto detect if we can use faster code for solid lighting.
* Various fixes for textured draw mode.
2013-03-10 15:38:23 +00:00
Tamito Kajiyama
66a2b84897 Merged changes in the trunk up to revision 54992.
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
2013-03-03 15:07:49 +00:00
Brecht Van Lommel
4643d61ffb OpenGL: implemenation of fixed function lighting as per pixel GLSL shaders. The
code is still unused, but the intention is to use this to solve the double sided
lighting problem on NVidia, and to make the materials work on OpenGL ES 2.0
eventually.

The code works and matches the fixed function lighting pretty much exactly, but
still needs optimizations. The actual integration in object draw will be
committed later when more fixing & testing, there's lots of different combinations
and unclear OpenGL state here.
2013-02-26 00:49:42 +00:00
Tamito Kajiyama
92436c94d3 Merged changes in the trunk up to revision 54594. 2013-02-16 18:38:03 +00:00