3 years agoMerge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8
Sybren A. Stüvel [Wed, 26 Apr 2017 14:50:29 +0000 (16:50 +0200)]
Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8

# Conflicts:
# source/blender/alembic/intern/

3 years agoAlembic export: support simple child hairs (Fix T51144)
Sybren A. Stüvel [Wed, 26 Apr 2017 13:31:03 +0000 (15:31 +0200)]
Alembic export: support simple child hairs (Fix T51144)

Simple child hairs don't have a face index number assigned, so the
call to dm->getTessFaceData(dm, num, CD_MFACE) would cause a crash. To
work around this, UV and normal vectors are copied from the parent

I've also removed an unnecessary call to dm->getTessFaceArray(dm);

Reviewers: kevindietrich

Differential Revision:

3 years agoAlembic: fixed indentation
Sybren A. Stüvel [Wed, 26 Apr 2017 13:17:28 +0000 (15:17 +0200)]
Alembic: fixed indentation

3 years agoAlembic: fixed memory leaks
Sybren A. Stüvel [Wed, 26 Apr 2017 13:17:19 +0000 (15:17 +0200)]
Alembic: fixed memory leaks

3 years agoAlembic: fixed refcount issue when duplicating imported objects
Sybren A. Stüvel [Wed, 26 Apr 2017 13:12:51 +0000 (15:12 +0200)]
Alembic: fixed refcount issue when duplicating imported objects

Duplicating an imported object didn't increment the cache reader's refcount,
whereas removing the duplicate did decrement it. This caused problems.

3 years agoFix T51280: Alembic: Crash when removing cache modifier
Sybren A. Stüvel [Wed, 26 Apr 2017 11:01:19 +0000 (13:01 +0200)]
Fix T51280: Alembic: Crash when removing cache modifier

The calls to id_us_plus/min were unnecessary (and caused assertion
failures) as this is already taken care of by transformcache_id_looper().

3 years agoGetting rid of setlinestyle: 3DView ruler.
Bastien Montagne [Wed, 26 Apr 2017 13:16:15 +0000 (15:16 +0200)]
Getting rid of setlinestyle: 3DView ruler.

3 years agoGawain: add immAttrib2fv helper.
Bastien Montagne [Wed, 26 Apr 2017 13:15:42 +0000 (15:15 +0200)]
Gawain: add immAttrib2fv helper.

3 years agoGetting rid of setlinestyle: non-camera 3DView render border.
Bastien Montagne [Wed, 26 Apr 2017 11:02:13 +0000 (13:02 +0200)]
Getting rid of setlinestyle: non-camera 3DView render border.

Also fixed wrong color for in-camera render border, and added a comment
to imm_cpack about expected color components order in integer parameter.

3 years agoFix material preview for Cycles and BI
Dalai Felinto [Wed, 26 Apr 2017 12:36:32 +0000 (14:36 +0200)]
Fix material preview for Cycles and BI

I had to update the .blend files too, and get them to use collections over the nameless old layers.

3 years agoLast commit broke object-armature select
Campbell Barton [Wed, 26 Apr 2017 12:39:12 +0000 (22:39 +1000)]
Last commit broke object-armature select

3 years agoDraw Manager: pose-bone selection
Campbell Barton [Wed, 26 Apr 2017 12:25:38 +0000 (22:25 +1000)]
Draw Manager: pose-bone selection

3 years agoOSX buildbot: remove redundant option
Jens Verwiebe [Wed, 26 Apr 2017 12:28:36 +0000 (14:28 +0200)]
OSX buildbot: remove redundant option

3 years agoOSX buildbot: disable unsupported calls for now and use quicktime off default
Jens Verwiebe [Wed, 26 Apr 2017 12:02:53 +0000 (14:02 +0200)]
OSX buildbot: disable unsupported calls for now and use quicktime off default

3 years agoAvoid platform dependant PATH_MAX
Campbell Barton [Wed, 26 Apr 2017 11:06:00 +0000 (21:06 +1000)]
Avoid platform dependant PATH_MAX

3 years agoGetting rid of setlinestyle: Squencer space.
Bastien Montagne [Wed, 26 Apr 2017 10:26:30 +0000 (12:26 +0200)]
Getting rid of setlinestyle: Squencer space.

Not much to add here, except that it needs the scale of its MVP matrix
to be taken into account here...

Reviewers: merwin, dfelinto

Differential Revision:

3 years agoAlembic export: also export empties
Sybren A. Stüvel [Wed, 26 Apr 2017 10:26:21 +0000 (12:26 +0200)]
Alembic export: also export empties

Exporting an empty creates an Alembic XForm object. The empties can also
be animated.

3 years agoAlembic export: renamed func object_is_shape → object_type_is_exportable
Sybren A. Stüvel [Wed, 26 Apr 2017 10:25:45 +0000 (12:25 +0200)]
Alembic export: renamed func object_is_shape → object_type_is_exportable

The function doesn't return whether the object is a shape at all, since
it also returns true for camera objects (and soon also for empties). It
returns true when objects of this type can be exported to Alembic at all.
This is now reflected in the name.

3 years agoGetting rid of setlinestyle: 3DView camera view.
Bastien Montagne [Wed, 26 Apr 2017 10:17:46 +0000 (12:17 +0200)]
Getting rid of setlinestyle: 3DView camera view.

Use new 2D dashed line shader in 3DView camera view.

Note that this also involved converting UI_draw_safe_areas() to this
dashed shader, which means it cannot be used anymore with other shaders.

Part of D2647.

3 years agoMove imm_draw_line_box_dashed to GPU_immediate_util.
Bastien Montagne [Wed, 26 Apr 2017 10:11:40 +0000 (12:11 +0200)]
Move imm_draw_line_box_dashed to GPU_immediate_util.

3 years agoTweak 2D line dashed shader to take a scale parameter.
Bastien Montagne [Wed, 26 Apr 2017 10:04:35 +0000 (12:04 +0200)]
Tweak 2D line dashed shader to take a scale parameter.

Even though in some cases this does not seems useful, in others (like
zommed 2D views) we have to correct MVP matrix scaling to get fixed
dashes size.

Note that we could do that differently (commented about it in shader),
would also have been cleaner to extract that MVP scale from within the
shader, but there does not seem to be a way to initialize uniform values
from within a shader, and would rather avoid recomputing the scale for
every run (especially since 3DViewport does not need it e.g.).

Part of D2647.

3 years agoUI utils: add helper to get float3 blended color from theme.
Bastien Montagne [Wed, 26 Apr 2017 09:59:13 +0000 (11:59 +0200)]
UI utils: add helper to get float3 blended color from theme.

3 years agoBLI_math: add helper function to extract XY 2D scale from a 4D matrix.
Bastien Montagne [Wed, 26 Apr 2017 09:55:50 +0000 (11:55 +0200)]
BLI_math: add helper function to extract XY 2D scale from a 4D matrix.

3 years agoSilence eevee warnings
Dalai Felinto [Wed, 26 Apr 2017 09:25:43 +0000 (11:25 +0200)]
Silence eevee warnings

3 years agoProper fixup for selection and core
Dalai Felinto [Wed, 26 Apr 2017 09:21:53 +0000 (11:21 +0200)]
Proper fixup for selection and core

That still not ideal, but so be it. IS_VIEWPORT_LEGACY should be
removed anyways, this is code from pre-draw manager and the
"modern viewport" as well as legacy will go away entirely once the draw
manager is feature complete.

3 years agoRevert "Fixup for "always use selection in core""
Dalai Felinto [Wed, 26 Apr 2017 09:19:15 +0000 (11:19 +0200)]
Revert "Fixup for "always use selection in core""

This reverts commit 535cf2c71409893748c21d00a7da32907fe54622.

3 years agoFixup for "always use selection in core"
Dalai Felinto [Wed, 26 Apr 2017 09:13:22 +0000 (11:13 +0200)]
Fixup for "always use selection in core"

In my previous commit [1] I forgot one of the if() calls. Handled it
differently now.

[1] dc1f491a506deafbd80f13b20783e477ef5f99fd

3 years agoPass depsgraph via Context to selection code
Dalai Felinto [Wed, 26 Apr 2017 08:46:55 +0000 (10:46 +0200)]
Pass depsgraph via Context to selection code

3 years agoSelection: Always use new selection code when building with using core profile
Dalai Felinto [Wed, 26 Apr 2017 08:42:21 +0000 (10:42 +0200)]
Selection: Always use new selection code when building with using core profile

3 years agoDepsgraph and selection: Flush selcol on Depsgraph
Dalai Felinto [Wed, 26 Apr 2017 08:40:41 +0000 (10:40 +0200)]
Depsgraph and selection: Flush selcol on Depsgraph

Selection code needs to iterate over DEG_OBJECT_ITER otherwise we won't
get modifiers, dupli objects, ...

Also make selection respect selectability flag.

Review by: Sergey Sharybin

3 years agoAlembic: shortened CacheFile.filepath to 1024 bytes again
Sybren A. Stüvel [Wed, 26 Apr 2017 08:40:54 +0000 (10:40 +0200)]
Alembic: shortened CacheFile.filepath to 1024 bytes again

As per discussion on 3128600a8ab2badd9ea39c80133f15f766794ec6

3 years agoAlembic: fixed C++98 compatibility
Sybren A. Stüvel [Wed, 26 Apr 2017 08:39:43 +0000 (10:39 +0200)]
Alembic: fixed C++98 compatibility

3 years agoAlembic import: added unit test for mesh deformation.
Sybren A. Stüvel [Tue, 25 Apr 2017 16:03:54 +0000 (18:03 +0200)]
Alembic import: added unit test for mesh deformation.

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Wed, 26 Apr 2017 08:11:03 +0000 (10:11 +0200)]
Merge branch 'master' into blender2.8

3 years agoRemove show_backface_culling check in select engine
Campbell Barton [Wed, 26 Apr 2017 08:08:49 +0000 (18:08 +1000)]
Remove show_backface_culling check in select engine

May add back so selection engine can read backface cull state
from from different engines.

3 years agoCycles: Fix access undefined macro on non-MSVC compiler
Sergey Sharybin [Wed, 26 Apr 2017 08:00:31 +0000 (10:00 +0200)]
Cycles: Fix access undefined macro on non-MSVC compiler

Also rremove trailing whitespace.

3 years agoCleanup: draw engine
Campbell Barton [Wed, 26 Apr 2017 07:42:39 +0000 (17:42 +1000)]
Cleanup: draw engine

- use DRW_engine prefix for engine types.
- use engine suffix for files that define a draw engine.
- remove engines from include path (they're only referenced once)

3 years agoDraw Manager: add select engine
Campbell Barton [Wed, 26 Apr 2017 07:20:11 +0000 (17:20 +1000)]
Draw Manager: add select engine

This does very little currently, but allows changing behavior for
selection drawing in the future.

3 years agoAllow new selection in eevee & blender draw modes
Campbell Barton [Wed, 26 Apr 2017 06:52:02 +0000 (16:52 +1000)]
Allow new selection in eevee & blender draw modes

3 years agoDraw Manager: armature editmode selection
Campbell Barton [Wed, 26 Apr 2017 06:11:37 +0000 (16:11 +1000)]
Draw Manager: armature editmode selection

3 years agoEevee: World default shader.
Clément Foucault [Tue, 25 Apr 2017 21:48:26 +0000 (23:48 +0200)]
Eevee: World default shader.

- Use uniform color world for the world probe.
- Refactored the Fresnel expression to be better with Area Lights.
- Squared the roughness for default materials.

3 years agoEevee: Disable shadow rendering until we get proper update scheduling.
Clément Foucault [Tue, 25 Apr 2017 21:33:52 +0000 (23:33 +0200)]
Eevee: Disable shadow rendering until we get proper update scheduling.

Performance is quickly getting poor when you have lights otherwise.

3 years agoEevee: Fix Square light with non uniform scale.
Clément Foucault [Tue, 25 Apr 2017 21:27:14 +0000 (23:27 +0200)]
Eevee: Fix Square light with non uniform scale.

3 years agoworkaround for T50176
lazydodo [Tue, 25 Apr 2017 20:17:41 +0000 (14:17 -0600)]
workaround for T50176

This works around a long outstanding issue T50176 with cycles on msvc2015/x86 . root cause is still unknown though,feels like a game of whack'a'mole

Reviewers: sergey, dingto

Subscribers: Blendify

Tags: #cycles

Differential Revision:

3 years agoDraw Manager: support for selection using engines
Campbell Barton [Tue, 25 Apr 2017 18:39:25 +0000 (04:39 +1000)]
Draw Manager: support for selection using engines

Needed to remove old draw code entirely.

Object mode selection support, pose and armature still need to be added.
Enabled when 'use_modern_viewport' is set.

3 years agoCycles: use safe compiler flags for OpenCL.
Hristo Gueorguiev [Tue, 25 Apr 2017 18:10:51 +0000 (20:10 +0200)]
Cycles: use safe compiler flags for OpenCL.

Using -cl-fast-relaxed-math assumes no NaN/Inf values in any expression.
This causes problems on overflow, division by zero, square root of negative number.
Comparisons with NaN or infinite value are affected as well.

This patch causes <2% slowdown on benchmark scenes.

Fix T50985: Rendering volume scatter with GPU OpenCL comes to an halt after a few seconds

3 years agoWorkaround for AMD GPU OpenCL compiler.
Hristo Gueorguiev [Tue, 25 Apr 2017 18:08:14 +0000 (20:08 +0200)]
Workaround for AMD GPU OpenCL compiler.

3 years agoEevee: Make default shaders works.
Clément Foucault [Tue, 25 Apr 2017 16:46:59 +0000 (18:46 +0200)]
Eevee: Make default shaders works.

- Added New Batch cache routine to get the split mesh for each material. (optimization needed)
- Did some shader modifications to create default_frag and support a somwhat correct fresnel for lamps (to finish)

3 years agoOutliner: Re-build depsgraph when reordering collections
Dalai Felinto [Tue, 25 Apr 2017 16:43:53 +0000 (18:43 +0200)]
Outliner: Re-build depsgraph when reordering collections

Otherwise if we create a new collection, and drag a collection into it we either
get a crash, or at the very least we dont get the visibility flags correct.

3 years agoRender API: Rename render > render_to_image; view_draw > render_to_view
Dalai Felinto [Tue, 25 Apr 2017 16:02:18 +0000 (18:02 +0200)]
Render API: Rename render > render_to_image; view_draw > render_to_view

This is part of the new draw manager design. Any engine (even clay, eevee, ...) should be able to draw to the viewport, as well as render to an image directly.
Changing the API names to conform to that.

3 years agoCycles: Use depsgraph instead of layers
Dalai Felinto [Tue, 25 Apr 2017 14:18:24 +0000 (16:18 +0200)]
Cycles: Use depsgraph instead of layers

3 years agoDepsgraph: Store Scene in depsgraph struct
Dalai Felinto [Tue, 25 Apr 2017 15:46:23 +0000 (17:46 +0200)]
Depsgraph: Store Scene in depsgraph struct

This way we can retrieve the scene from depsgraph that were not created from a G.main (e.g., when doing material thumbnail preview render).

3 years agoCleanup: Line-width
Dalai Felinto [Mon, 24 Apr 2017 10:41:54 +0000 (12:41 +0200)]
Cleanup: Line-width

3 years agoMerge branch 'master' into blender2.8
Sybren A. Stüvel [Tue, 25 Apr 2017 15:04:17 +0000 (17:04 +0200)]
Merge branch 'master' into blender2.8

3 years agoAlembic import: don't use global main
Sybren A. Stüvel [Tue, 25 Apr 2017 15:03:15 +0000 (17:03 +0200)]
Alembic import: don't use global main

3 years agoAlembic import: removed BaseLegacy from BKE_cachefile_clean
Sybren A. Stüvel [Tue, 25 Apr 2017 14:56:36 +0000 (16:56 +0200)]
Alembic import: removed BaseLegacy from BKE_cachefile_clean

Now we just iterate over all objects. It may be a better idea to use a
smarter approach for performance. However, since this function is not
called regularly (only when changing Alembic file paths), it's not a very
big deal.

3 years agoDraw Manager: clear draw global data after use
Campbell Barton [Tue, 25 Apr 2017 14:39:53 +0000 (00:39 +1000)]
Draw Manager: clear draw global data after use

3 years agoDraw Manager: store context vars per draw
Campbell Barton [Tue, 25 Apr 2017 14:35:08 +0000 (00:35 +1000)]
Draw Manager: store context vars per draw

Was performing context access per object for scene, region etc.
While not very slow they don't change during drawing so cache in a struct.

This also makes it possible to draw in views besides the current context.

3 years agoFix T51292: Alembic import, show notification when trying to load HDF5
Sybren A. Stüvel [Tue, 25 Apr 2017 12:30:01 +0000 (14:30 +0200)]
Fix T51292: Alembic import, show notification when trying to load HDF5

HDF5 Alembic files are not officially supported by Blender. With this
commit, the HDF5 format is detected even when Blender is compiled without
HDF5 support, and the user is given an explanatory error message (rather
than the generic "Could not open Alembic archive for reading".

3 years agoCycles: Fix strict compiler flags
Sergey Sharybin [Tue, 25 Apr 2017 12:11:45 +0000 (14:11 +0200)]
Cycles: Fix strict compiler flags

3 years agoFix OSX buildbot
Jens Verwiebe [Tue, 25 Apr 2017 12:05:03 +0000 (14:05 +0200)]
Fix OSX buildbot

3 years agoFix T51262: Blender CRASH with alembic file
Sybren A. Stüvel [Tue, 25 Apr 2017 10:05:55 +0000 (12:05 +0200)]
Fix T51262: Blender CRASH with alembic file

Also added a unit test for exporting & importing very long names.

3 years agoCycles: Cleanup, mainly line length in random module
Sergey Sharybin [Tue, 25 Apr 2017 09:42:36 +0000 (11:42 +0200)]
Cycles: Cleanup, mainly line length in random module

Was doing lots of investigation recently, with need to have lots of things
side by side.

3 years agoRevert "Alembic: Construct ISampleSelector once and pass along"
Sybren A. Stüvel [Tue, 25 Apr 2017 08:43:36 +0000 (10:43 +0200)]
Revert "Alembic: Construct ISampleSelector once and pass along"

This reverts commit 099816587a0e064fb6a52c82a737ae8814cf21df. It had some
unforseen side-effects that should be investigated first.

3 years agoCycles: Split vectorized math utilities to a dedicated files
Sergey Sharybin [Fri, 14 Apr 2017 12:05:23 +0000 (14:05 +0200)]
Cycles: Split vectorized math utilities to a dedicated files

This file was even a bigger mess than vectorized types header,
cleaning it up to make it easier to maintain this files and
extend further.

3 years agoCycles: Split vectorized types into separate files
Sergey Sharybin [Thu, 13 Apr 2017 17:34:45 +0000 (19:34 +0200)]
Cycles: Split vectorized types into separate files

The final goal to reach is to make vectorized types much easier to maintain
and the previous design had following issues:

- Having all types and methods implementation made the source file rather
  bloated and unfun to navigate in.

- It was not possible to quickly glance available API for the type you are
  interested in.

- Adding more vectorization types will bloat the file even more, making
  things even more tricky to follow.

3 years agoCycles: Cleanup, preprocessor indentation
Sergey Sharybin [Thu, 13 Apr 2017 16:59:46 +0000 (18:59 +0200)]
Cycles: Cleanup, preprocessor indentation

3 years agoFix T51284: Mesh not skinned
Sybren A. Stüvel [Tue, 25 Apr 2017 08:01:34 +0000 (10:01 +0200)]
Fix T51284: Mesh not skinned

3 years agoWM: don't search for app-template when its empty
Campbell Barton [Tue, 25 Apr 2017 07:14:46 +0000 (17:14 +1000)]
WM: don't search for app-template when its empty

Changing from a loaded app-template back to Default (none set)
would scan paths for a file with no name. Harmless but silly.

3 years agoOpenGL: better context creation on Windows
Mike Erwin [Tue, 25 Apr 2017 02:30:17 +0000 (22:30 -0400)]
OpenGL: better context creation on Windows

Compatibility profile was working fine, this is mostly to get the highest GL core profile version available.

Our minimum requirement is 3.3 core profile.  When we request a specific GL version:
 - AMD and Intel give us exactly this version
 - NVIDIA gives at least this version <-- desired behavior
so we ask for 4.5, 4.4 ... 3.3 in descending order to get the best version on the user's system.

Accept OpenGL 3.0 on Mesa instead of 3.3+ compatibility profile. (requested by @LazyDodo) This will be removed after we finish moving to core profile.

Part of T49012 and T51164

3 years agogroup WITH_LEGACY_OPENGL with the other GL options
Mike Erwin [Mon, 24 Apr 2017 21:41:26 +0000 (17:41 -0400)]
group WITH_LEGACY_OPENGL with the other GL options

Blender subsystems that care about OpenGL use GL_DEFINITIONS, which now includes the newest (temporary) WITH_LEGACY_OPENGL.

Also updated Gawain's CMake to use this instead of its own logic.

3 years agoCycles: Remove re-hashing done in BPT volume code
Sergey Sharybin [Mon, 24 Apr 2017 19:47:17 +0000 (21:47 +0200)]
Cycles: Remove re-hashing done in BPT volume code

Since 9d50175 this is no longer needed, at least not with the current
sampler we are using.

3 years agoCollection: __FUNCTION__ > __func__
Dalai Felinto [Mon, 24 Apr 2017 16:15:37 +0000 (18:15 +0200)]
Collection: __FUNCTION__ > __func__

3 years agoLayer cleanup: Rename _Iterator_ > _iterator_
Dalai Felinto [Mon, 24 Apr 2017 16:14:41 +0000 (18:14 +0200)]
Layer cleanup: Rename _Iterator_ > _iterator_

3 years agoBring back outliner hierachy delete
Dalai Felinto [Mon, 24 Apr 2017 15:14:01 +0000 (17:14 +0200)]
Bring back outliner hierachy delete

3 years agoFix view local not working
Dalai Felinto [Mon, 24 Apr 2017 15:12:09 +0000 (17:12 +0200)]
Fix view local not working

3 years agoOutliner: Bring back bases when pertinent
Dalai Felinto [Mon, 24 Apr 2017 16:05:51 +0000 (18:05 +0200)]
Outliner: Bring back bases when pertinent

This partially reverts c4e34a84e0a4599a751758050528eef389bd061f

Note: This is necessary for the "delete hierarchy" functionality

3 years agoFOREACH_SELECTED_BASE iterator
Dalai Felinto [Mon, 24 Apr 2017 16:06:13 +0000 (18:06 +0200)]

3 years agoFix own mistake in smoke.c
Luca Rood [Mon, 24 Apr 2017 15:15:17 +0000 (17:15 +0200)]
Fix own mistake in smoke.c

3 years agoConvert BaseLegacy to Base (part)
Luca Rood [Fri, 21 Apr 2017 12:28:23 +0000 (14:28 +0200)]
Convert BaseLegacy to Base (part)

3 years agoCleanup: remove unnecessary texface checks
Campbell Barton [Mon, 24 Apr 2017 12:45:40 +0000 (22:45 +1000)]
Cleanup: remove unnecessary texface checks

3 years agoMerge branch 'master' into blender2.8
Campbell Barton [Mon, 24 Apr 2017 12:11:05 +0000 (22:11 +1000)]
Merge branch 'master' into blender2.8

3 years agoCleanup: style
Campbell Barton [Mon, 24 Apr 2017 11:58:28 +0000 (21:58 +1000)]
Cleanup: style

3 years agoCycles: Cleanup, space after keyword
Sergey Sharybin [Mon, 24 Apr 2017 09:21:35 +0000 (11:21 +0200)]
Cycles: Cleanup, space after keyword

3 years agoAdd C internal version of msgfmt (similar to makesrna/dna binaries).
Bastien Montagne [Mon, 24 Apr 2017 08:49:54 +0000 (10:49 +0200)]
Add C internal version of msgfmt (similar to makesrna/dna binaries).

Fixes performance issues of C++ one with Windows MSVC debug builds...

Merely a translation from code by @sergey, using BLI libs intead of C++'s stdlib.

Reviewers: sergey, campbellbarton, LazyDodo

Subscribers: sergey

Differential Revision:

3 years agoBLI_dynstr: add memarena-based version, and helper to clear without freeing.
Bastien Montagne [Mon, 24 Apr 2017 08:42:10 +0000 (10:42 +0200)]
BLI_dynstr: add memarena-based version, and helper to clear without freeing.

3 years agoUsual i18n/UI messages fixes and cleanup.
Bastien Montagne [Mon, 24 Apr 2017 07:33:22 +0000 (09:33 +0200)]
Usual i18n/UI messages fixes and cleanup.

3 years ago[msvc/make.bat] Add convenience option to turn off game engine+player
lazydodo [Sun, 23 Apr 2017 20:45:51 +0000 (14:45 -0600)]
[msvc/make.bat] Add convenience option to turn off game engine+player

3 years agoCMake: Fix CMake for non Apple systems
Thomas Beck [Sun, 23 Apr 2017 17:10:04 +0000 (19:10 +0200)]
CMake: Fix CMake for non Apple systems

Follow up to
apple_check_quicktime() macro is only defined for apple, so ignore it otherwise.

3 years agoCMake: move some Apple specific code into platform_apple_xcode.cmake.
Brecht Van Lommel [Sun, 23 Apr 2017 15:42:45 +0000 (17:42 +0200)]
CMake: move some Apple specific code into platform_apple_xcode.cmake.

3 years agoCMake: disable WITH_CODEC_QUICKTIME for macOS > 10.11 for configurations.
Romain Foyard [Sun, 23 Apr 2017 15:27:59 +0000 (17:27 +0200)]
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:

3 years agoCMake: fix wrong alembic test name on Windows.
Brecht Van Lommel [Sun, 23 Apr 2017 15:27:12 +0000 (17:27 +0200)]
CMake: fix wrong alembic test name on Windows.

3 years ago[msvc/make.bat] Allow override of the build folder name
lazydodo [Sun, 23 Apr 2017 16:10:57 +0000 (10:10 -0600)]
[msvc/make.bat] Allow override of the build folder name

3 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Sun, 23 Apr 2017 08:49:39 +0000 (10:49 +0200)]
Merge branch 'master' into blender2.8


3 years agomissing from last commit
Campbell Barton [Sat, 22 Apr 2017 18:06:45 +0000 (04:06 +1000)]
missing from last commit

3 years agoFix armature drawing ignoring object matrix
Campbell Barton [Sat, 22 Apr 2017 18:01:54 +0000 (04:01 +1000)]
Fix armature drawing ignoring object matrix

Looks like name-space collision.

3 years agoDraw Manager: hide 2d curves normals
Campbell Barton [Sat, 22 Apr 2017 17:28:53 +0000 (03:28 +1000)]
Draw Manager: hide 2d curves normals

3 years agoOSX: satisfy macro to also apply alembic tests
Jens Verwiebe [Sat, 22 Apr 2017 17:03:59 +0000 (19:03 +0200)]
OSX: satisfy macro to also apply alembic tests

3 years agoDisable breaking alembic test for osx
Jens Verwiebe [Sat, 22 Apr 2017 16:39:11 +0000 (18:39 +0200)]
Disable breaking alembic test for osx

3 years agoCleanup: line length
Campbell Barton [Sat, 22 Apr 2017 06:11:12 +0000 (16:11 +1000)]
Cleanup: line length