Blender Git Commits

Overlapping edge order fixed (exits old polygon before enters new polygon)

Interior label propagation

Merge remote-tracking branch 'origin/master' into soc-2014-bge

Order bug fixed.

Finally nailed the edge-skipping bug (required minor architectural change). The out-of-order bug still lurks, but it should be relatively trivial.

Fix for MSVC where __func__ is not defined unless you accidentally include BLI_compiler_compat.h

BLI_restrict macro to help the compiler optimize functions that do not allow pointer aliasing.

New Matrix and Vector Operations for Viewport FX

New functions required for emulation an OpenGL style matrix stack on the GPU
New functions that replace functionality provided by GLU
Some fixes to make various matrix and vector functions const correct
More efficient '_q' matrix functions that assume no pointer aliasing
A set of macros for initializing vector arrays (VEC2D, VEC3D, VEC4D)
2 and 4 dimensional versions of VECCOPY macro
Typo fix, ortho_v2_v2 formal parameter implied a 3 element array, instead of the proper 2

Windows: Enable numpy again, as we do have libs again for vc2013 and against py3.4.

Updating submodule to point to v2.71

Refactored code to fix bug on reallocation of large vertex table.

Using 0 as an error sentinel for the swap interval is not strictly correct.

0 is a valid value for a swap interval and different users of getSwapInterval may want to substitute different values if the swap interval cannot be read.

This commit changes the prototype to: GHOST_TSuccess getSwapInterval(int& intervalOut)

Users of the function should either check the return value or set intervalOut to a default value before calling getSwapInterval.

Backport revisions for the release

da64e8ae0551b85760855b5b5bdfdb2673985223
88d8358f91e1306a67d59250162443194ee9edcf

GHOST_ContextCGL

Initial pass at a re-factored OpenGL context for Cocoa.
This does not yet implement the same checks and warnings that the WGL and EGL contexts have.

Set BLENDER_VERSION_CYCLE to release

Update of GHOST_ContextNone so that functions recently added to the interface have dummy implementations that are no-ops but still "succeed" at doing nothing (the defaults in GHOST_Context "fail" to do nothing)

Separation of desired stereo and multisample parameters from actual values along with some other fixes to GHOST

stereoVisual and numOfAASamples now stored in GHOST_Context
parameters for GHOST_Window renamed to wantStereoVisual and wantNumOfAASamples to reflect that context creation will try to satisfy the request, but not fail if it cannot.
The parameters in GHOST_Context hold the actual values that were initialized
added isValid to base GHOST_Window
added updateDrawingContext to GHOST_Context and GHOST_Window (However, it is only needed by OSX)
fixed typo: WGLEW_WGL_EXT_swap_control -> WGLEW_EXT_swap_control

The GLU library in BLENDER_GL_LIBRARIES was accidentally being replaced. Solution is to use list(APPEND) instead of set().

Cherry pick revs for release

f325ddb0d7f876587f12464fab51810f118ee06d
a21caf32ccb3379cae93ec8062daf0b258014027
8f30414c29bc62447bc6664d9395778cae027133
3a101d8c92730d7b98732710e41aafd940a31aff
a3cf97e2aa28b7d916cdcb8b5c85f7926a5e3fce
9cf66d9248f4d99857365b06de6b7a1fa4c3f563
b49e6d04ccb672029478d681133efae9842ba330
22a961317a1c0405f41966205e22f70fb3769799
179e7eaf394481c10b66b4db762e8189aa5a0a2a
84e8cabac604a59b7abe4cce37df02d6ef12a0bf
a5a869c579de97437deded3482d9f04555a8ee26
d1b45f7f7c77c964a0dfd27c5518c063cbb77026
155a6106d0f205218aa6fa42a7f1b2263a276f83
caf609cda3bb3075065f82724a89e399b80f0ae7
66421f211928af40d81c67c0ed6e3269ff884e9d
3bd965bc03500c552e043ad7e0eb55853e2b0755
f37ec65f8011ec7b642887b6103b2e5d932f127d
cc0c94d535e4c0ee322876f6e6c7bd271f5316fa
4f0e42489f9d8bb0bc8de005e811cef630458bf5
fc1040cc47594e2a68d120cf08c0c3c70fbc44d1
72f77dd69afc929fcde20ffc1dc66b5149c01b1f

settings for SDF tweaked