griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
69,212 Commits 1 Branch 0 Tags
4edee280e4214cff99ef813ce656231df8bb40ea
Commit Graph

1582 Commits

Author SHA1 Message Date
Campbell Barton
98b6c6f2c0 Merge branch 'master' into blender2.8 2017-04-27 21:42:08 +10:00
Campbell Barton
bdf8ad6c4e Cleanup: spelling 2017-04-27 21:41:03 +10:00
Sybren A. Stüvel
dc27d31a21 Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8 
# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc
 2017-04-26 16:50:29 +02:00
Jens Verwiebe
87f483debb OSX buildbot: remove redundant option 2017-04-26 14:28:36 +02:00
Jens Verwiebe
c1aea353ae OSX buildbot: disable unsupported calls for now and use quicktime off default 2017-04-26 14:04:09 +02:00
Sybren A. Stüvel
6822e353ff Merge branch 'master' into blender2.8 2017-04-25 17:04:17 +02:00
Jens Verwiebe
0b84f21b08 Fix OSX buildbot 2017-04-25 14:05:03 +02:00
Campbell Barton
2010dbe8a5 Merge branch 'master' into blender2.8 2017-04-24 22:11:05 +10:00
Brecht Van Lommel
14a4ce6d7f CMake: move some Apple specific code into platform_apple_xcode.cmake. 2017-04-23 18:24:47 +02:00
Romain Foyard
a192d5b81c CMake: disable WITH_CODEC_QUICKTIME for macOS > 10.11 for configurations. 
QtKit was removed in macOS Sierra, this patch disables WITH_CODEC_QUICKTIME
in Sierra and greater versions of macOS.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D2645
 2017-04-23 18:24:47 +02:00
Bastien Montagne
f93f4169cb Merge branch 'master' into blender2.8 
Conflicts:
	build_files/cmake/platform/platform_apple.cmake
 2017-04-23 10:49:39 +02:00
Jens Verwiebe
20c9c1b44e OSX: satisfy macro to also apply alembic tests 2017-04-22 19:03:59 +02:00
Mike Erwin
ef640ecf10 OpenGL: remove use of GLEW MX 
MX (Multiple conteXt) support was dropped from the GLEW 2.0 library to make core profile support cleaner.

Our WITH_GLEW_MX build option was OFF by default already; this commit removes the inactive code paths.

I'm working on a plan for multiple GPUs, contexts, resource sharing, etc. This commit gives us a cleaner starting point for that upcoming work.

Tested on Mac, will test on Linux & Windows immediately after pushing.
 2017-04-22 00:35:04 -04:00
lazydodo
dc5bd2784f [cmake] Fix Alembic build errors with msvc 2017-04-21 12:18:19 -06:00
Sybren A. Stüvel
cc2d501642 Merge branch 'master' into blender2.8 2017-04-21 16:30:24 +02:00
Sergey Sharybin
e4ab70da86 CMake: Add option to build against system-wide Glog 
Similar to previous commit for Gflags.
 2017-04-21 14:36:34 +02:00
Sybren A. Stüvel
81011679dd Merge branch 'master' into blender2.8 2017-04-21 14:19:05 +02:00
Sergey Sharybin
c7a5c48cba CMake: Add option to link against system-wide Gflags library 
It is disabled by default, so should not affect existing configurations.

Main benefits of this goes as:

- Linux distros can use that to avoid libraries duplication and link
  blender package against gflags package from the system.

- It it easier to test whether Blender works with updated version of
  Gflags prior to re-bundling the library.
 2017-04-21 12:01:27 +02:00
Dalai Felinto
c9d78b6c43 Merge remote-tracking branch 'origin/master' into blender2.8 2017-04-18 16:30:13 +02:00
Bastien Montagne
3922d5194f Fix install_deps.sh for new Ubuntu 17.04, which does not have libopenjpeg! 2017-04-18 15:24:09 +02:00
Bastien Montagne
95b3632112 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
 2017-04-14 12:39:54 +02:00
Sergey Sharybin
7cfabcef5c Buildbot: Fix typos 2017-04-14 10:03:51 +02:00
Sergey Sharybin
b354c15805 Buildbot: Attempt to fix CUDA compilation on OSX 
Stupid toolkit is really fragile about CLang version.
 2017-04-14 10:01:28 +02:00
Sergey Sharybin
513aacbdb6 Use immediate mode API for OpenColorIO 2017-04-11 15:39:04 +02:00
Bastien Montagne
346964eb3f Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/gpencil/drawgpencil.c
 2017-04-10 16:53:12 +02:00
Luca Rood
358def15a3 Install deps: Fix compilation error of Alembic 
Couple of things here:

- Boost is not necesserily compiled into your /opt/lib and system-wide
  version might have been used. The recent change in Alembic did not
  take this into account.

- Alembic needs some extra component of Boost.
  This part might be missing now for other distros than DEB.
 2017-04-10 15:55:25 +02:00
Campbell Barton
c800ee6bfe Merge branch 'master' into blender2.8 2017-04-09 16:09:12 +10:00
Sybren A. Stüvel
063bae4fcc Merge branch 'master' into blender2.8 
# Conflicts:
#	source/blender/alembic/intern/abc_exporter.h
#	source/blender/alembic/intern/abc_util.cc
 2017-04-07 17:28:22 +02:00
Sergey Sharybin
eae691f89e Buildbot: List freetype for OIIO libraries 
OIIO in release environment is compiled with Freetype support.

This fixes compilation error of static unit tests.
 2017-04-07 17:01:07 +02:00
Sergey Sharybin
07708b85b4 Buildbot: Link statically against freetype 2017-04-07 17:00:43 +02:00
Sergey Sharybin
4360a74715 CMake: Fix detection of idiff program 2017-04-07 17:00:06 +02:00
Sergey Sharybin
c637e749b2 Tests: Fix compilation error with static OpenMP 2017-04-07 16:06:28 +02:00
Sybren A. Stüvel
8ae656bf22 CMake: Fixed order of bf_alembic in SETUP_BLENDER_SORTED_LIBS 
bf_alembic depends on bf_bmesh, and should therefore be above it.
 2017-04-06 16:47:00 +02:00
Sergey Sharybin
0feca278a4 Merge branch 'master' into blender2.8 2017-04-06 12:31:26 +02:00
Sergey Sharybin
ae76a90593 Buildbot: Correct previous release 
Seems CMake is not happy about changing compiler from script.
 2017-04-06 11:39:06 +02:00
Sergey Sharybin
97300a3beb Buildbot: Force build environment to use latest GCC 2017-04-06 11:21:07 +02:00
Bastien Montagne
e9bb018a4a Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/alembic/intern/abc_exporter.h
 2017-04-05 10:02:25 +02:00
Bastien Montagne
8647d5af90 InstallDeps: Raise minimal & official version of OIIO to 1.7.13. 
As requested by @sergey.
 2017-04-05 09:26:41 +02:00
Sergey Sharybin
7fc84d4e32 Merge branch 'master' into blender2.8 2017-04-04 15:47:58 +02:00
Sybren A. Stüvel
a63a31dd12 install_deps: removed leftover compile_HDF5 command 
It was a leftover from when Alembic with HDF5 was still officially
supported.
 2017-04-04 14:50:58 +02:00
Sybren A. Stüvel
8a60d84327 Bumped Alembic library version to 1.7.1 
This provides us with a clearer API (so I don't have to use const_cast<>
in upcoming code). It also allows layering of different Alembic files,
so you can have a base file and load a separate file containing overrides.

Verbally approved by Dr. Sergey.
 2017-04-04 12:55:38 +02:00
Sergey Sharybin
ffac92e385 Buildbot: Update master config 2017-04-04 12:52:54 +02:00
Sybren A. Stüvel
b93ddfd8ac Alembic: force ALEMBIC_LIB_USES_BOOST=ON when not using C++11 
Alembic requires one of ALEMBIC_LIB_USES_BOOST, ALEMBIC_LIB_USES_TR1, or
C++11, and silently defaults to the latter if the former two are OFF.

Before this change, Alembic was only built without C++11 of OpenEXR
was built at the same time. This dependency was both unnecessary and
undocumented.
 2017-04-04 12:41:44 +02:00
Sergey Sharybin
4f7eb3ad12 Buildbot: Update master config 2017-04-04 12:15:35 +02:00
Sergey Sharybin
728f75c6a7 Buildbot: Some more twqeaks to master config 2017-04-03 15:51:31 +02:00
Sergey Sharybin
e741804ce3 Buildbot: Update bundled vetrsion of server configuration 2017-04-03 15:36:52 +02:00
Sergey Sharybin
5884c9f1ba Merge branch 'master' into blender2.8 2017-04-03 15:15:56 +02:00
Sergey Sharybin
cc93a66e71 Buildbot: SPecial branch trickery for linux slaves 2017-04-03 15:04:16 +02:00
Sergey Sharybin
d27ef3913a Buildbot: Some special tricks for Blender 2.8 slave 2017-04-03 14:49:07 +02:00
Campbell Barton
2be098a1a0 Merge branch 'master' into blender2.8 2017-03-29 20:20:53 +11:00