Commit Graph

55228 Commits

Author SHA1 Message Date
Jens Verwiebe 5efa7fa534 Fix possible harmful warning: the value of the size argument in 'strncat' is too large, change the argument to be the free space in the destination buffer minus the terminating null byte 2014-08-05 12:03:31 +02:00
Sergey Sharybin b3e3ca7464 Fix T41318: OSL broken on Linux kubuntu 14.04
Now for real, hopefully.
2014-08-05 15:53:00 +06:00
Sergey Sharybin b9c8572d71 Fix wrong assert happening in the CUEW 2014-08-05 15:28:59 +06:00
Martijn Berger b9e4929846 Fix: T41318
OSL compiler signature changed with 1.5.
2014-08-05 11:11:52 +02:00
Sergey Sharybin 77b7e1fe9a Deduplicate CUDA and OpenCL wranglers
For now it was mainly about OpenCL wrangler being duplicated
between Cycles and Compositor, but with OpenSubdiv work those
wranglers were gonna to be duplicated just once again.

This commit makes it so Cycles and Compositor uses wranglers
from this repositories:

  - https://github.com/CudaWrangler/cuew
  - https://github.com/OpenCLWrangler/clew

This repositories are based on the wranglers we used before
and they'll be likely continued maintaining by us plus some
more players in the market.

Pretty much straightforward change with some tricks in the
CMake/SCons to make this libs being passed to the linker
after all other libraries in order to make OpenSubdiv linked
against those wranglers in the future.

For those who're worrying about Cycles being less standalone,
it's not truth, it's rather more flexible now and in the future
different wranglers might be used in Cycles. For now it'll
just mean those libs would need to be put into Cycles repository
together with some other libs from Blender such as mikkspace.

This is mainly platform maintenance commit, should not be any
changes to the user space.

Reviewers: juicyfruit, dingto, campbellbarton

Reviewed By: juicyfruit, dingto, campbellbarton

Differential Revision: https://developer.blender.org/D707
2014-08-05 13:57:50 +06:00
Campbell Barton a3fac84c73 Cleanup: indentation 2014-08-05 13:36:35 +10:00
Tamito Kajiyama f0259d0a53 Fix for double freeing of MEM_guardedalloc'ed memory originating from BLF_lang_set(). 2014-08-05 11:21:02 +09:00
Campbell Barton 6b6ea0485f Macros: replace UNPACK#OP -> UNPACK#_EX, allow suffix 2014-08-05 08:06:19 +10:00
Antony Riakiotakis e4a13e40eb Fix memory leak of main lock when reading from library files. 2014-08-04 16:01:48 +02:00
Bastien Montagne 6ba4db2906 Fix T41175: Quad View - Properties Region - Clip Tickable option bug? 2014-08-04 14:27:18 +02:00
Campbell Barton a90e49e40a Tweaks to macros 2014-08-04 11:43:10 +10:00
Campbell Barton a039f2bfc4 Macros: prevent instantiation of args for type checks
also make CHECK_TYPE_INLINE more strict
2014-08-04 11:18:33 +10:00
Campbell Barton cc28e02a85 Cleanup: replace int cast with floorf when comparing time 2014-08-04 10:22:45 +10:00
Campbell Barton 7848bf00b8 Correct cu->pathlen treated as a float 2014-08-04 10:15:25 +10:00
Campbell Barton 784c99f53c Correct glitch in recent menu commit, click-drag locked menus 2014-08-04 06:03:56 +10:00
Bastien Montagne 6fa6fa2fa2 Fix T41284: The python ops log doesn't work. 2014-08-03 21:17:41 +02:00
Jason Wilkins b3faabae2f Fixed linking OIIO on Windows. The debug and optimized options need to be before each individual library in a list. 2014-08-03 11:35:39 -05:00
Jens Verwiebe 02b66f8a55 OSX/buildsystem: prepare usage on OSX 10.10 - Yosemite
- important: requires cmake >= 2.8.12 to read minor version right,
aka older cmake rates 10.10 lower than 10.6 for example ! ( sigh )
2014-08-03 12:51:35 +02:00
Campbell Barton 47e7ce696c Fix for glitch with menus not reliably setting an active item (D674)
When menus are clamped to the window bounds,
its was possible not to have an active menu-item under the mouse,
Making Ctrl+S,Enter not completely reliable.

Changes needed to support this are:

- menu item is activated on popup menus
  (to avoid relying on mouse-over)
- moving mouse away from menu items only de-activates when over a new menu-item.
- Mouse clicks are ignored if they are not directly over the menu item.
2014-08-03 20:35:28 +10:00
Martijn Berger e7b396c954 fix check for not llvm 2014-08-02 15:30:28 +02:00
Martijn Berger 249fbbf764 Collada and llvm both use the same functions and they clash.
Since we have older llvm for msvc2008 and new one for msvc2013 we need to work around it.
2014-08-02 15:20:03 +02:00
Campbell Barton d5b471eec1 CMake: add header 2014-08-02 19:16:00 +10:00
Campbell Barton 88a0d5ebe8 Make CHECK_TYPE_NONCONST macro portable
also replace __typeof -> typeof
2014-08-02 18:08:44 +10:00
Campbell Barton d98b6a289c BMesh: typecheck iterator 2014-08-02 18:05:13 +10:00
Martijn Berger bc9bbca41b Move to OIIO 1.4 also for windows x86 2014-08-02 09:59:09 +02:00
Campbell Barton 9c3025cd26 Spelling 2014-08-02 16:53:52 +10:00
Campbell Barton 7b83e3d6d7 CMake: tweak so 2.8.7 and older still work (disable WITH_BUILDINFO) 2014-08-02 03:08:29 +10:00
Bastien Montagne 3c9e11df37 Cleanup: Move SpaceTransform helpers from BKE_shrinkwrap to BLI_math_matrix. 2014-08-01 16:31:06 +02:00
Bastien Montagne c11777b211 Cleanup: Move object_get_derived_final from BKE_shrinkwrap to BKE_DerivedMesh
Note this func needs some love, but this will be for later (should never have been in shrinkwrap code!).
2014-08-01 16:31:06 +02:00
Thomas Dinges 59f4ba854b Cycles: Update stdosl.h for OSL 1.5. 2014-08-01 15:23:58 +02:00
Martijn Berger f51282fc57 Cmake prefers NOT to ! 2014-08-01 15:18:34 +02:00
gaiaclary 0d1484e4ad Make function definition consistent with function declaration (as discussed with campbell) 2014-08-01 14:32:04 +02:00
Martijn Berger 6d7333a2f5 Fix msvc 2013 / win64 to use new OIIO and llvm and resulting linking
requirements
2014-08-01 14:28:00 +02:00
Campbell Barton 7f32cf4605 Prevent macros hiding casts from const pointers 2014-08-01 22:03:03 +10:00
Martijn Berger c9366a2969 Make build work with llvm3.4 and oiio 1.4 2014-08-01 13:43:12 +02:00
Sergey Sharybin 42aef164f4 Fix T41197: Blender freezes to infinite loop when switching to PAUSED Cycles rendered viewport 2014-08-01 16:57:43 +06:00
Sergey Sharybin 2f2bf513e9 Revert "Fix T41226: Wrong Undo on curves and hooks"
This reverts commit e042c8428f.

Proper fix will come later, or be declared a TODO.
2014-08-01 12:30:41 +06:00
Jens Verwiebe 3e607f61b5 OSX/cmake: adapt bundle structure according scons 2014-08-01 01:23:31 +02:00
Dalai Felinto 7f9a4c0c42 Bake-API: cleanup - missing (size_t) promotion 2014-07-31 20:09:07 -03:00
Jens Verwiebe 23190c3c73 OSX: updated codesigning README and removed not longer valid rule plists 2014-08-01 01:01:12 +02:00
Jens Verwiebe a4c287ed7d OSX/scons: Change Blender bundle datastructures + referennces to match the upcoming codesigning needs
- i used deprecated rules up to now which will break in OSX > 10.9.5 and 10.10 > dp4
- todo: adapt cmake due it will break with this commit
2014-08-01 00:57:17 +02:00
Sergey Sharybin 54472df750 Fix T41236: Rendered viewport doesn't update with material actions
The issue was caused by NLA evaluation without actions not setting
id's flag as updated (as that's happening when action writes data
to the ID datablock).

Added the same flag set for the NLA evaluation as what's happening
for actions.
2014-07-31 22:06:05 +06:00
Campbell Barton da638d49e3 Style cleanup 2014-08-01 02:03:09 +10:00
Bastien Montagne 5e3af04b08 Fix build player... 2014-07-31 17:34:13 +02:00
Antony Riakiotakis 4f18ab1b20 Fix T40958 align rotation + project individual elements not working
This is another example of transform code crappiness. Projection
snapping for objects is handled separately than regular snapping.
Luckilly for us, we have the normal ready from the raycast result and a
copy of code from ElementRotation function can do the necessary
rotations for us.

I have not enforced constraints here (arguably, maybe I should, and the
already present projection snapping should do that too but seems it is
commented out and the unorthodox order of operations here has me a bit
scared. Leaving as TODO)
2014-07-31 17:02:17 +02:00
Martijn Berger bcbbed0ccf Use dynamically linked SDL 1.2.15 on windows x64 2014-07-31 16:43:02 +02:00
Sergey Sharybin eb016eb3ae Fix T41258: Crash when entering edit mode while viewport render is enabled
The issue was caused by the render engine loading edit mesh, which re-allocates
mesh array which might be referenced by other object's derived meshed.

Worst thing about this is that updating render engine happens from the end of
scene update function, after all the objects are updated and so. This is needed
so render engine gets the update objects which is correct.

The only proper way to solve the issue is to make it so viewport engine does not
leave objects in inconsistent state, meaning nobody will reference to freed data.

In order to reach this we do edit mesh loading before running objects update so
all the objects which uses that mesh will have proper references in the derived
mesh.

This also solves old creepyness which happened before when having single object
in edit mode. tweaking it will calculate derived mesh as a part of scene update,
then this derived mesh will be freed by edit mesh loading and viewport will be
creating derived mesh again.

Now render engine is expected to do nothing with meshes which are in edit mode,
but they still need to load edit data for non0meshes. It's not really easy to
do from the BKE level because needed functions are implemented in the editor.

Thanks Campbell for the review!

Differential Revision: https://developer.blender.org/D697
2014-07-31 20:25:11 +06:00
Antony Riakiotakis 3ccd9b78a9 Partial fix of T40824,
Fill selection for file browser moves to ctrl-shift click due to
collision with emulate middle mouse button option
2014-07-31 14:26:06 +02:00
Sergey Sharybin e042c8428f Fix T41226: Wrong Undo on curves and hooks 2014-07-31 18:21:57 +06:00
Antony Riakiotakis cba027c8c3 Fix T41140
Yet another attempt to fix the annoying lines that crop up in texture
painting on edges and quads. I feel this needs better investigation but
using pixel tolerance here looks like alleviates the issue.
2014-07-31 12:15:38 +02:00