Commit Graph

898 Commits

Author SHA1 Message Date
Campbell Barton
d4a11388bf Code Cleanup: warnings 2013-11-22 11:30:40 +11:00
Emanuel Claesson
2479594351 CMake: minor spelling fix for WITH_BOOST
Reviewed By: brecht

Differential Revision: http://developer.blender.org/D26
2013-11-21 17:38:52 +01:00
Jens Verwiebe
02114a6737 OSX/Cmake: workaround for missing OpenGL headers, make sure sdk lookup 2013-11-20 00:39:03 +01:00
Sergey Sharybin
780459e406 Extra unwanted change from the previous commit 2013-11-19 22:25:08 +06:00
Sergey Sharybin
50fbebe0a4 Buildinfo fixes
- Use -M suffix if working tree does have uncommitted
  modifications.
- Local commits are considered local changes as well
2013-11-19 22:22:21 +06:00
Brecht Van Lommel
965c1357c4 CMake: only enable opencollada by default on OS X and Windows, consistent with scons. 2013-11-19 00:43:44 +01:00
Jens Verwiebe
5eb1dba6e0 Cmake: after lot of times commit checking missed including collada, set on by default now 2013-11-18 14:30:38 +01:00
Brecht Van Lommel
b764fe58c5 CMake OS X: enable FFMPEG and Quicktime by default to match release and scons. 2013-11-17 15:37:10 +01:00
Jens Verwiebe
f8eb006d09 OSX/cmake: rollback ca5bbe0e41 cause OSX versions can have not subversion thus sw_vers -productVersion is not usable for sdk setting 2013-11-15 23:20:38 +01:00
Jens Verwiebe
2b793822ad OSX/cmake: use CMAKE_XCODE_ATTRIBUTE rather than CMAKE_OSX_SYSROOT and set min deployment target to 10.6 now 2013-11-15 20:05:23 +01:00
Jens Verwiebe
ca5bbe0e41 OSX/cmake: simplify system-version detection 2013-11-15 19:26:43 +01: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
4e96e04643 OSX/CMake: fix ftemplate condition 2013-10-24 18:46:00 +00:00
Irie Shinsuke
42ac7164e3 Fix for commit r60718. There was a remaining WITH_IMAGE_OPENIMAGEIO in CMakeLists.txt still. 2013-10-13 09:35:54 +00:00
Dalai Felinto
7c2fae19b4 cmake/openimageio - partially reverting #60692
We now have openimageio building when cycles builds or when it's
manually set to build.

(I reverted the _IMAGE_ in the define name because I think the closer
the cmake flags match the defines in the software the better, and there
is no reason to rename all the existent WITH_OPENIMAGEIO references in
CMakeLists.txt - which would be the alternative)
2013-10-12 23:56:21 +00:00
Dalai Felinto
acc6998007 adding url for openimageio project in CMake file (OpenEXR and OpenJpeg do the same) 2013-10-11 16:48:42 +00:00
Dalai Felinto
029f4b9767 adding WITH_IMAGE_OPENIMAGEIO and removing the PSD build option
As per Brecht van Lommel's suggestion.
2013-10-11 16:38:04 +00:00
Sergey Sharybin
4bd4037276 Lock-free memory allocator
Release builds will now use lock-free allocator by
default without any internal locks happening.

MemHead is also reduces to as minimum as it's possible.
It still need to be size_t stored in a MemHead in order
to make us keep track on memory we're requesting from
the system, not memory which system is allocating. This
is probably also faster than using a malloc's usable
size function.

Lock-free guarded allocator will say you whether all
the blocks were freed, but wouldn't give you a list
of unfreed blocks list. To have such a list use a
--debug or --debug-memory command line arguments.

Debug builds does have the same behavior as release
builds. This is so tools like valgrind are not
screwed up by guarded allocator as they're currently
are.

--
svn merge -r59941:59942 -r60072:60073 -r60093:60094 \
          -r60095:60096 ^/branches/soc-2013-depsgraph_mt
2013-10-10 11:58:01 +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
Campbell Barton
6aedad4bff fix for crash on load if the file was saved in editmesh,
BKE_mesh_uv_cdlayer_rename_index was checking editmesh pointer before it was NULL'd by direct_link_mesh.
2013-10-07 16:48:26 +00:00
Campbell Barton
1f53674bb8 avoid divide by zero with grid fill (when there is no selection) 2013-10-05 11:59:15 +00:00
Campbell Barton
9b1be7ce93 add cmake option WITH_MEM_VALGRIND, helps to track down errors with mempool use which sometimes only show up as bugs in very rare cases (because even though the element is freed, the chunk is still allocated). 2013-10-03 12:22:44 +00:00
Campbell Barton
c4bad6868f cmake - cached LLVM values would be overwritten on every execution. 2013-09-25 17:04:01 +00:00
Campbell Barton
124f32a206 rename LLVM_LIB_DIR to LLVM_LIBPATH to match other cmake vars. 2013-09-25 16:31:54 +00:00
Dalai Felinto
a5c4faef62 CMake: BOOST is a dependency of OpenImageIO 2013-09-24 15:16:46 +00:00
Dalai Felinto
97cb65df52 typos on error messages in CMake 2013-09-23 13:21:27 +00:00
Jens Verwiebe
0c4e665c05 OSX/cmake: fix config by moving code back into xcode conditional, cmake/makefiles does not even have xcode_vesion lookup 2013-09-15 10:56:36 +00:00
Jens Verwiebe
809cb5e478 OSX/cmake: don't try get xcode path from xcode before 4.3, developer dir was not bundled in this case 2013-09-14 12:11:26 +00:00
Jens Verwiebe
7a47803053 OSX/cmake: move the new xcode-select-handing outside xcode conditional, to fix cmake/make compile 2013-09-13 21:13:57 +00:00
Jens Verwiebe
e59bc04aa7 OSX/cmake: allow for compiling with xcode develper previews by determing xcode-select 2013-09-13 14:57:57 +00:00
Campbell Barton
92d94ccb08 misc minor changes
- make cmake osx use of -ftemplate-depth match scons.
- use array size within sizeof(), more compact.
- replace AT with __func__ where the function is unique enough.
- BLI_box_pack_2D -> 2d to match other functions.
- rename new mesh normal calculation to mesh.calc_normals_split()
2013-09-10 19:23:39 +00:00
Jens Verwiebe
ba13c16065 OSX/cmake: assure finding jack framework 2013-09-10 18:56:33 +00:00
Brecht Van Lommel
d703f616db Fix libmv build error on OS X with Xcode 5. 2013-09-09 12:15:14 +00:00
Brecht Van Lommel
f634509dc2 CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth. 2013-09-06 12:43:27 +00:00
Campbell Barton
427317d8d8 use CMAKE_DL_LIBS rather then linking libdl directly.
added to cycles standalone too.
2013-08-30 20:26:57 +00:00
Thomas Dinges
a51f8e4353 Cycles / Standalone:
* Standalone can now be compiled without the GUI, making the glut dependency optional. 

Added WITH_CYCLES_STANDALONE_GUI cmake flag.
2013-08-30 17:34:27 +00:00
Campbell Barton
f75711db7f cmake: set python, llvm and osl libs as advanced. 2013-08-28 04:32:39 +00:00
Thomas Dinges
ff4e018753 Cycles / Standalone:
* Rename test to standalone.

Note: New CMAKE flag is WITH_CYCLES_STANDALONE.
2013-08-27 02:37:48 +00:00
Campbell Barton
26c0839220 disable cycles when building without python, also use const for function args in more places. 2013-08-07 22:40:03 +00:00
Mitchell Stokes
103ef7cacb Merged changes from trunk r58324-58419. 2013-07-19 22:10:11 +00:00
Campbell Barton
b7826c42df enable type limits warning when compiling with gcc. 2013-07-19 10:39:25 +00:00
Mitchell Stokes
eb21bdd249 Merging changes from trunk r58091-58323. 2013-07-17 01:40:26 +00:00
Campbell Barton
02ba328ca8 clang/cmake - quiet warnings for external libs and reference moto as a system include. 2013-07-15 08:26:16 +00:00
Mitchell Stokes
60812e0260 BGE cleanup: Removing the GamePlayer/xembed folder and associated build options. This code was very old and not used. For example web player code, look at Burster. 2013-07-09 01:24:51 +00:00
Brecht Van Lommel
8d6e5e2fee Cycles: update build configurations to include CUDA sm_35 architecture. When using
a compiler older than CUDA 5.0 it will give a warning and skip this architecture.
2013-06-20 13:10:47 +00:00
Campbell Barton
15016873ab dont use 'if(${WITH_STATIC_LIBS})', no need to expend the variable. 2013-06-19 11:26:11 +00:00
Campbell Barton
970e9123b4 cmake: remove set_lib_path macro 2013-06-17 18:15:56 +00:00
Thomas Dinges
91d7df12ee CMake / vc2010:
* Remove vc2010 support from cmake. 

There is some "if(MSVC10)" left in extern - ceres, but will leave that for Sergey. :)
2013-06-17 18:00:38 +00:00
Campbell Barton
412c043474 Python script auto-execution changes:
- 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.
2013-06-10 00:42:16 +00:00