blender.git
5 years agoDDS missed newline printing errors.
Campbell Barton [Thu, 8 Jan 2015 17:23:01 +0000 (04:23 +1100)]
DDS missed newline printing errors.

5 years agoFix gtest linking on ubuntu and do minor cleanup.
Antony Riakiotakis [Thu, 8 Jan 2015 16:17:40 +0000 (17:17 +0100)]
Fix gtest linking on ubuntu and do minor cleanup.

Generally for build systems, libraries that do not depend on other
libraries, such as system libraries, OpenGL etc always go at the end.

We could even get rid of some duplicate dependency libraries here but
auto duplication by build systems and differences between OSs make this
difficult.

GTest still duplicates all libraries twice to solve some issues which is
weird (maybe libs are not sorted correctly for some reason? needs
investigation)

5 years agoFix T43159: Copying of linked datablocks using relpath leads to invalid paths in...
Bastien Montagne [Thu, 8 Jan 2015 13:38:48 +0000 (14:38 +0100)]
Fix T43159: Copying of linked datablocks using relpath leads to invalid paths in new copies.

Simply have to rebase onto main filepath when copying, if source datablock is lib and path is relative.

Afaict, only affected Image and Text datablocks. MovieClip would also be a candidate, but has
no copy implemented currently.

5 years agocorrect permissions
Campbell Barton [Thu, 8 Jan 2015 12:01:15 +0000 (23:01 +1100)]
correct permissions

5 years agoexclude git/arc files from tgz archive
Campbell Barton [Thu, 8 Jan 2015 11:48:15 +0000 (22:48 +1100)]
exclude git/arc files from tgz archive

5 years agoFix crash in texture paint sampling when sampling materials without
Antony Riakiotakis [Thu, 8 Jan 2015 11:47:19 +0000 (12:47 +0100)]
Fix crash in texture paint sampling when sampling materials without
textures slots

5 years agoFix for wrong boolean flag check
Sergey Sharybin [Thu, 8 Jan 2015 09:42:15 +0000 (14:42 +0500)]
Fix for wrong boolean flag check

This fixes obvious overflows when checking bitflags, who knows how much
undiscovered issues exists in the code still..

5 years agoBetter check that preview seq is cleared on exit
Campbell Barton [Thu, 8 Jan 2015 09:14:42 +0000 (20:14 +1100)]
Better check that preview seq is cleared on exit

5 years agoGHash: use reinsert instead of remove/insert
Campbell Barton [Thu, 8 Jan 2015 08:58:01 +0000 (19:58 +1100)]
GHash: use reinsert instead of remove/insert

5 years agocleanup: style
Campbell Barton [Thu, 8 Jan 2015 08:57:50 +0000 (19:57 +1100)]
cleanup: style

5 years agoFix T40257: Frustum culling not working properly
Mitchell Stokes [Thu, 8 Jan 2015 04:41:07 +0000 (20:41 -0800)]
Fix T40257: Frustum culling not working properly

Instead of getting fancy this time, we'll just use Mahalin's simpler
fix. This may have slight performance impacts, but it is a lot simpler
than the previous fix and shouldn't cause as many bugs.

5 years agoRevert "Fix T40257: Frustum culling not working properly"
Mitchell Stokes [Thu, 8 Jan 2015 04:31:08 +0000 (20:31 -0800)]
Revert "Fix T40257: Frustum culling not working properly"

This reverts commit 315609ec0c1e28eb12bde3e8bbd2a5b03672b1a9.

This fix still causes more issues than it solves.

5 years agoFix invalid memory access in gradient brushes - could cause a crash in
Antony Riakiotakis [Wed, 7 Jan 2015 22:01:42 +0000 (23:01 +0100)]
Fix invalid memory access in gradient brushes - could cause a crash in
MacOS.

This looks like an oldie and should not influence release, but if we do
make an 'a' build it's safe to include.

Report by Craig Jones, thanks!

5 years agoQuite warning about unused func.
Bastien Montagne [Wed, 7 Jan 2015 18:47:31 +0000 (19:47 +0100)]
Quite warning about unused func.

(not my day...)

5 years agoRemove 'ensure previews' call from write code.
Bastien Montagne [Wed, 7 Jan 2015 18:30:12 +0000 (19:30 +0100)]
Remove 'ensure previews' call from write code.

Sorry about that, should have checked this stuff more, with Internal material
renders are very fast (unoticable), but with Cycles it can take (a lot of) time,
like several minutes or more.

Will probably fall back to a dedicated operator users will have to fire themselves
when they want previews in their files.

5 years agoPyAPI docs: minor changes to sphinx docs.
Campbell Barton [Wed, 7 Jan 2015 16:53:55 +0000 (03:53 +1100)]
PyAPI docs: minor changes to sphinx docs.

5 years agoRecalculate particle pathcache stuff for all particles instead of
Lukas Tönne [Wed, 7 Jan 2015 15:15:03 +0000 (16:15 +0100)]
Recalculate particle pathcache stuff for all particles instead of
trying to be smart.

This breaks child interpolation otherwise because sometimes parent
paths are not calculated and give bad clumping results.

5 years agoPyAPI: Call to get the pixel x,y in a text block
Martin Felke [Wed, 7 Jan 2015 14:14:07 +0000 (01:14 +1100)]
PyAPI: Call to get the pixel x,y in a text block

This allows scripts to request the screen location of any (line, column) pair.

5 years agoMore tweak to preview commit - do not 'render' non-used IDs either.
Bastien Montagne [Wed, 7 Jan 2015 13:10:14 +0000 (14:10 +0100)]
More tweak to preview commit - do not 'render' non-used IDs either.

Thanks to Campbell for the headup.

5 years agoUgh, forgot to invert that one in previous commit, sorry for the noise...
Bastien Montagne [Wed, 7 Jan 2015 11:46:18 +0000 (12:46 +0100)]
Ugh, forgot to invert that one in previous commit, sorry for the noise...

5 years agoEnsure mat/tex/etc. previews are generated/saved in .blend files when enabled in...
Bastien Montagne [Wed, 7 Jan 2015 11:31:25 +0000 (12:31 +0100)]
Ensure mat/tex/etc. previews are generated/saved in .blend files when enabled in userprefs.

Reviewers: campbellbarton

Differential Revision: https://developer.blender.org/D970

5 years agoFollowup to fe3e000: no need to exit pose mode on operator redo
Sergey Sharybin [Wed, 7 Jan 2015 10:38:32 +0000 (15:38 +0500)]
Followup to fe3e000: no need to exit pose mode on operator redo

This is to be backported to the release branch.

5 years agoFix for bool flag use
Campbell Barton [Wed, 7 Jan 2015 00:41:45 +0000 (11:41 +1100)]
Fix for bool flag use

5 years agocleanup: de-duplicate code
Campbell Barton [Wed, 7 Jan 2015 00:40:44 +0000 (11:40 +1100)]
cleanup: de-duplicate code

5 years agoFix: Segfault in Image Editor when transforming GPencil Strokes
Joshua Leung [Wed, 7 Jan 2015 00:19:49 +0000 (13:19 +1300)]
Fix: Segfault in Image Editor when transforming GPencil Strokes

5 years agoFix: Missing updates for UI panels and main region when using Grease Pencil in Image...
Joshua Leung [Wed, 7 Jan 2015 00:12:37 +0000 (13:12 +1300)]
Fix: Missing updates for UI panels and main region when using Grease Pencil in Image Editor

5 years agoFix: Restored "Draw Poly" to D Ctrl RMB, as D Alt LMB was blocked by Alt-D (duplicate...
Joshua Leung [Tue, 6 Jan 2015 23:41:25 +0000 (12:41 +1300)]
Fix: Restored "Draw Poly" to D Ctrl RMB, as D Alt LMB was blocked by Alt-D (duplicate) keymap

5 years agoCycles: Allow negative values in Combine XYZ node.
Thomas Dinges [Tue, 6 Jan 2015 21:52:23 +0000 (22:52 +0100)]
Cycles: Allow negative values in Combine XYZ node.

5 years agoEvent System Cleanup: Modifier Key Assignment Switch
julianeisel [Tue, 6 Jan 2015 19:27:59 +0000 (20:27 +0100)]
Event System Cleanup: Modifier Key Assignment Switch

Was quite messy previously, think this is much more readable and easier to follow.

5 years agoSubmodules: Make them pointing to the master branch
Sergey Sharybin [Tue, 6 Jan 2015 19:18:18 +0000 (00:18 +0500)]
Submodules: Make them pointing to the master branch

Otherwise it gives all sort of weird and wonderful artifacts.

5 years agoFix T40435: Fix event system modifier key handling
julianeisel [Tue, 6 Jan 2015 17:34:29 +0000 (18:34 +0100)]
Fix T40435: Fix event system modifier key handling

This partial reverts rBd800cffaf10cb7, but fixes T40435 (Background label is not
redrawn).

It now isn't possible to use single modifier keys as shortcuts anymore. But this
is something that's not really useful at all, since it breaks more than it allows.

5 years agoRemove slurph shape-key feature
Campbell Barton [Tue, 6 Jan 2015 15:02:55 +0000 (02:02 +1100)]
Remove slurph shape-key feature

This is an old option which wasn't working in over a year without complaint.

5 years agoFix copy-paste of colors to generated color not being correct. '
Antony Riakiotakis [Tue, 6 Jan 2015 14:48:02 +0000 (15:48 +0100)]
Fix copy-paste of colors to generated color not being correct. '

Change generated color property to gamma space to match the add new
image operator.

5 years agoLogic Bricks *must* be kept in alphabetical order
Dalai Felinto [Tue, 6 Jan 2015 14:28:57 +0000 (12:28 -0200)]
Logic Bricks *must* be kept in alphabetical order

5 years agoFix T43137: vertex bevel percent mode wasn't implemented.
Howard Trickey [Tue, 6 Jan 2015 14:12:40 +0000 (09:12 -0500)]
Fix T43137: vertex bevel percent mode wasn't implemented.

5 years agoPoint submodules ot latest release tags
Sergey Sharybin [Tue, 6 Jan 2015 13:47:05 +0000 (18:47 +0500)]
Point submodules ot latest release tags

5 years agoSequencer: show extensions when preview enabled
Campbell Barton [Tue, 6 Jan 2015 12:09:56 +0000 (23:09 +1100)]
Sequencer: show extensions when preview enabled

5 years agoExpose viewer panels also when backdrop is active. Allows to select
Antony Riakiotakis [Tue, 6 Jan 2015 11:17:06 +0000 (12:17 +0100)]
Expose viewer panels also when backdrop is active. Allows to select
proxy size, render type etc.

5 years agoCycles: Repot CPU and CUDA capabilities to system info operator
Sergey Sharybin [Tue, 6 Jan 2015 09:13:21 +0000 (14:13 +0500)]
Cycles: Repot CPU and CUDA capabilities to system info operator

For CPU it gives available instructions set (SSE, AVX and so).

For GPU CUDA it reports most of the attribute values returned by
cuDeviceGetAttribute(). Ideally we need to only use set of those
which are driver-specific (so we don't clutter system info with
values which we can get from GPU specifications and be sure they
stay the same because driver can't affect on them).

5 years agoFix T43143: DPX header wrong, making it impossible to import to other software
Sebastian Koenig [Tue, 6 Jan 2015 08:39:48 +0000 (13:39 +0500)]
Fix T43143: DPX header wrong, making it impossible to import to other software

The issue was caused by the single letter in header, which is expected to be
captial as per standard: http://www.simplesystems.org/users/bfriesen/dpx/S268M_Revised.pdf

5 years agocleanup: warnings
Campbell Barton [Tue, 6 Jan 2015 07:21:46 +0000 (18:21 +1100)]
cleanup: warnings

5 years agoCorrect args from recent mathutils refactor
Campbell Barton [Tue, 6 Jan 2015 07:32:54 +0000 (18:32 +1100)]
Correct args from recent mathutils refactor

5 years agoPyAPI: add PyList_APPEND
Campbell Barton [Tue, 6 Jan 2015 06:39:47 +0000 (17:39 +1100)]
PyAPI: add PyList_APPEND

This appends while giving ownership to the list, avoiding temp assignment.
This matches PyList_SET_ITEM which bypasses refcount's

Note, this also reduce code-size, Py_DECREF is a rather heavy macro.

5 years agoPyAPI: add utilities PyTuple_SET_ITEMS, Py_INCREF_RET
Campbell Barton [Tue, 6 Jan 2015 05:42:22 +0000 (16:42 +1100)]
PyAPI: add utilities PyTuple_SET_ITEMS, Py_INCREF_RET

Setting all values of a tuple is such a common operation that it deserves its own macro.
Also added Py_INCREF_RET to avoid confusing use of comma operator.

5 years agoBGE: Fix for bugs T42520 and T42097 (mouse look actuator related).
Jorge Bernal [Tue, 6 Jan 2015 06:06:40 +0000 (22:06 -0800)]
BGE: Fix for bugs T42520 and T42097 (mouse look actuator related).

With this fix the mouse actuator movement works well as with even screen resolutions as odd screen resolutions.
Also it fixed the movement when the border of the blenderplayer window is out of the screen limits.

Reviewed By: moguri

Differential Revision: https://developer.blender.org/D946

5 years agoFix T43122: Shrinkwrap target, wrong linked object
Campbell Barton [Tue, 6 Jan 2015 03:01:18 +0000 (14:01 +1100)]
Fix T43122: Shrinkwrap target, wrong linked object

5 years agoUI: refactor button string get/set into functions.
Campbell Barton [Tue, 6 Jan 2015 00:05:08 +0000 (11:05 +1100)]
UI: refactor button string get/set into functions.

5 years agoCorrection to previous commit
julianeisel [Mon, 5 Jan 2015 23:02:57 +0000 (00:02 +0100)]
Correction to previous commit

Just realized menu buttons are using hardmin and hardmax for a bad hack which will make the assert fail :/

5 years agoFix/cleanup very ugly and unsafe usage of but->str in ui_but_update().
Bastien Montagne [Mon, 5 Jan 2015 20:38:15 +0000 (21:38 +0100)]
Fix/cleanup very ugly and unsafe usage of but->str in ui_but_update().

Currently, but->str should never be smaller than but->strdata, but code shall
not rely on this.

Further more, but->strdata is 'only' 128 chars, this could become limit with some
translations, if the org label is already rather long, leading to truncated str
(Chinese e.g. can only store about 40 chars in strdata).

5 years agoFix T43111: Node Editor (Slider) Draw Glitch
julianeisel [Mon, 5 Jan 2015 20:05:17 +0000 (21:05 +0100)]
Fix T43111: Node Editor (Slider) Draw Glitch

* don't allow Node Editor input max value to be less then min value
* avoid the num slider drawing glitch if softmin equals softmax
* assert if softmax/hardmax is smaller than softmin/hardmin

With this, we sort of allow softmin/hardmin and softmax/hardmax being the same.

5 years agoMore border clamping removed.
Antony Riakiotakis [Mon, 5 Jan 2015 13:26:56 +0000 (14:26 +0100)]
More border clamping removed.

5 years agoRemove border clamping. Usually we just want to clamp to edge instead.
Antony Riakiotakis [Mon, 5 Jan 2015 13:23:15 +0000 (14:23 +0100)]
Remove border clamping. Usually we just want to clamp to edge instead.

Note - checked all glTexImage functions and we never use that. Border is
ifdefed out too here.

5 years agoFileBrowser: small tweak to new search feature: clear that string when changing dir.
Bastien Montagne [Mon, 5 Jan 2015 11:23:41 +0000 (12:23 +0100)]
FileBrowser: small tweak to new search feature: clear that string when changing dir.

In 99% of cases, you do not want to keep the same filter when changing dir,
and having to reset it by hand is *very* annoying!

5 years agoOutliner 'Blender file' view: Show libs used both directly and indirectly both on...
Bastien Montagne [Mon, 5 Jan 2015 10:28:34 +0000 (11:28 +0100)]
Outliner 'Blender file' view: Show libs used both directly and indirectly both on main level and in nested tree.

Request from Gooseberry team. This eases a bit managing dependancies in complex .blend files.

Reviewers: campbellbarton

Subscribers: fsiddi

Projects: #user_interface, #bf_blender:_next

Differential Revision: https://developer.blender.org/D943

5 years agoUse float format for high bit depth textures if available - storage
Antony Riakiotakis [Mon, 5 Jan 2015 10:23:44 +0000 (11:23 +0100)]
Use float format for high bit depth textures if available - storage
requirements are the same but we may avoid some clipping of float values
for HDRs when used in shaders.

5 years agoRecent fix for SDL2 broke joysticks for SDL1.2
Campbell Barton [Mon, 5 Jan 2015 09:23:30 +0000 (20:23 +1100)]
Recent fix for SDL2 broke joysticks for SDL1.2

5 years agoCleanup: OSX: remove obsolete ppc/ppc64 sw-renderer kCGL attributes
Jens Verwiebe [Sun, 4 Jan 2015 19:42:16 +0000 (20:42 +0100)]
Cleanup: OSX: remove obsolete ppc/ppc64 sw-renderer kCGL attributes

5 years agoPartial fix for T43113: Filebrowser: Empty folders do not contain go back arrow.
Bastien Montagne [Sun, 4 Jan 2015 16:54:12 +0000 (17:54 +0100)]
Partial fix for T43113: Filebrowser: Empty folders do not contain go back arrow.

Do not allow going into un-readable directories at all.
Note we might want to reflect that 'state' in UI for users too, but that will be
for later.

Also, not quite sure this fix the windows case, will have to start my VM... :/

5 years agoSequencer: Preview dragging playhead over strips
Campbell Barton [Sun, 4 Jan 2015 15:12:50 +0000 (02:12 +1100)]
Sequencer: Preview dragging playhead over strips

Bring back the 2.4x feature.

also show a highlight when a strip is being previewed.

5 years agoFix sequencer border-flickering
Campbell Barton [Sun, 4 Jan 2015 12:20:56 +0000 (23:20 +1100)]
Fix sequencer border-flickering

Offscreen viewport drawing wasn't properly restoring the theme.
Add API calls to store/restore the theme so it can be temporarily overridden.

5 years agosequencer: don't return big values (fill pointer instead)
Campbell Barton [Sun, 4 Jan 2015 11:46:54 +0000 (22:46 +1100)]
sequencer: don't return big values (fill pointer instead)

5 years agoFix for crash for 'Edit Source'
Campbell Barton [Sun, 4 Jan 2015 11:22:37 +0000 (22:22 +1100)]
Fix for crash for 'Edit Source'

was accessing freed menu region.

5 years agoFileBrowser: Cleanup: rename some (really ugly) enum names.
Bastien Montagne [Sun, 4 Jan 2015 11:03:47 +0000 (12:03 +0100)]
FileBrowser: Cleanup: rename some (really ugly) enum names.

5 years agoFreestyle: reserve array sizes before filling
Campbell Barton [Sun, 4 Jan 2015 10:20:45 +0000 (21:20 +1100)]
Freestyle: reserve array sizes before filling

also use PyList_GET_ITEM when list size is known.

5 years agoFix 8 memory leaks from bad PyList_Append use
Campbell Barton [Sun, 4 Jan 2015 09:33:29 +0000 (20:33 +1100)]
Fix 8 memory leaks from bad PyList_Append use

5 years agoFix T43119: mathutils.intersect_point_line always returns a 2D vector as first value.
Bastien Montagne [Sun, 4 Jan 2015 09:11:21 +0000 (10:11 +0100)]
Fix T43119: mathutils.intersect_point_line always returns a 2D vector as first value.

Trivial, safe for final 2.73.

5 years agomathutils: refactor instantiation
Campbell Barton [Sun, 4 Jan 2015 06:03:54 +0000 (17:03 +1100)]
mathutils: refactor instantiation

remove 'type' argument, very few mathutils objects are wrapped,
add new function for creating wrapped objects.

also fixes unlikely memory leak if the data-array can't be allocated.

5 years agocleanup: use 'coords' abbreviation for functions.
Campbell Barton [Sun, 4 Jan 2015 03:20:31 +0000 (14:20 +1100)]
cleanup: use 'coords' abbreviation for functions.

5 years agocleanup: create cube, use index lookups
Campbell Barton [Sun, 4 Jan 2015 03:19:53 +0000 (14:19 +1100)]
cleanup: create cube, use index lookups

5 years agoFix T43114: File Browser - don't highlight '..' while using border select
julianeisel [Sun, 4 Jan 2015 01:36:42 +0000 (02:36 +0100)]
Fix T43114: File Browser - don't highlight '..' while using border select

5 years agoFileBrowser: add search field in header bar.
Bastien Montagne [Sat, 3 Jan 2015 20:55:16 +0000 (21:55 +0100)]
FileBrowser: add search field in header bar.

Not much to add, pretty straightforward...

5 years agoFreestyle: memory consumption optimization in stroke rendering.
Tamito Kajiyama [Fri, 8 Aug 2014 13:29:02 +0000 (22:29 +0900)]
Freestyle: memory consumption optimization in stroke rendering.

Previously individual strokes were represented by distinct mesh objects
no matter how many vertices and materials each stroke has, although
the vertex and material counts can be quite small depending on the input
scene data.  Now stroke meshes are packed into a minimum number of
mesh objects, so as to reduce the overheads of Blender object creation.

5 years agoBump subversion so that version patches for theme changes work
Joshua Leung [Sat, 3 Jan 2015 12:17:22 +0000 (01:17 +1300)]
Bump subversion so that version patches for theme changes work

5 years agoD824: Add themeing for keyframe lines in Timeline
Diego Garcia [Sat, 3 Jan 2015 11:48:29 +0000 (00:48 +1300)]
D824: Add themeing for keyframe lines in Timeline

Reviewed by: Joshua Leung (aligorith)

5 years agoGrease Pencil: Vertex size and colours are now themable
Joshua Leung [Sat, 3 Jan 2015 05:07:05 +0000 (18:07 +1300)]
Grease Pencil: Vertex size and colours are now themable

5 years agoCleanup: rename 'filelist' BLI funcs to consistent naming.
Bastien Montagne [Sat, 3 Jan 2015 11:27:40 +0000 (12:27 +0100)]
Cleanup: rename 'filelist' BLI funcs to consistent naming.

Also, add an optional callback to `BLI_filelist_free()` to allow freein
void poin if needed (consistency with `BLI_filelist_duplicate()`...).

5 years agoRefactor 'fit in camera view' code, and expose it to RNA.
Bastien Montagne [Sat, 3 Jan 2015 11:05:16 +0000 (12:05 +0100)]
Refactor 'fit in camera view' code, and expose it to RNA.

This changes BKE's fitting code to use `BKE_camera_params_compute_viewplane` instead of
`BKE_camera_view_frame`. This allows that code to work with orthographic projection too.

Also, two funcs were added to rna's Object, to resp. get the projection matrix of that
object (mostly useful for cameras and lamps objects), and return position this object
should be to see all (to fit) a given set of points.

Reviewers: campbellbarton

Reviewed By: campbellbarton

Differential Revision: https://developer.blender.org/D961

5 years agoAdd some BLI helpers needed by asset branch.
Bastien Montagne [Sat, 3 Jan 2015 09:13:02 +0000 (10:13 +0100)]
Add some BLI helpers needed by asset branch.

`BLI_strncpy_ensure_pad()` is also useful with current master code.

The two others (`BLI_strcmp_ignore_pad()` and `BLI_filelist_duplicate()`)
are only used in asset branch currently, but think they could be useful
in other places too, and simplifies handling of asset branch & future patch review.

Reviewers: campbellbarton

Reviewed By: campbellbarton

Differential Revision: https://developer.blender.org/D965

5 years agoGTest: test beautify with polyfill
Campbell Barton [Sat, 3 Jan 2015 07:04:37 +0000 (18:04 +1100)]
GTest: test beautify with polyfill

5 years agoGTest was broken on Linux
Campbell Barton [Sat, 3 Jan 2015 06:50:52 +0000 (17:50 +1100)]
GTest was broken on Linux

5 years agoFix for view map cache not flushed by updates of edge detection options.
Tamito Kajiyama [Fri, 2 Jan 2015 16:48:27 +0000 (01:48 +0900)]
Fix for view map cache not flushed by updates of edge detection options.

This fix should be considered for inclusion in the 2.73 release, since
it concerns a new feature of Freestyle introduced in 2.73.

5 years agoFix RNA Image.frame_duration.
Bastien Montagne [Fri, 2 Jan 2015 21:49:00 +0000 (22:49 +0100)]
Fix RNA Image.frame_duration.

If a video was loaded (e.g. from python) but never 'ibuf-acquired', its Image->anim
prop would still be NULL, returning useless '1' value as frame duration!

5 years agoCycles: Fix compilation error on AVX platforms with -arch-native
Sergey Sharybin [Fri, 2 Jan 2015 19:04:10 +0000 (00:04 +0500)]
Cycles: Fix compilation error on AVX platforms with -arch-native

Was a conflict in headers between clew and util_optimization.h.

5 years agoFix (unreported) 'pad9' not shown by UserPrefs' KeyBinding filter.
Bastien Montagne [Fri, 2 Jan 2015 17:24:25 +0000 (18:24 +0100)]
Fix (unreported) 'pad9' not shown by UserPrefs' KeyBinding filter.

Minor glicth, but still... Safe for 2.73.

5 years agoCycles: Fix unneeded int/float conversion happened in previous commit
Sergey Sharybin [Fri, 2 Jan 2015 12:21:24 +0000 (17:21 +0500)]
Cycles: Fix unneeded int/float conversion happened in previous commit

5 years agoFix T43027: OpenCL kernel compilation broken after QBVH
Sergey Sharybin [Fri, 2 Jan 2015 09:58:01 +0000 (14:58 +0500)]
Fix T43027: OpenCL kernel compilation broken after QBVH

OpenCL apparently does not support templates, so the idea of generic
function for swapping is a bit of a failure. Now it is either inlined
into the code (in triangle intersection) or has specific implementation
for QBVH.

This is probably even better, because we can't create QBVH-specific
function in util_math anyway.

5 years agoFix T43099: Modifiers in edit mode might mess up materials
Sergey Sharybin [Fri, 2 Jan 2015 09:23:54 +0000 (14:23 +0500)]
Fix T43099: Modifiers in edit mode might mess up materials

The issue was originall caused by 2e8ba17 by removing necessery call
GPU_enable_material(). It was probably removed because in some cases
material was enabled after calling setDrawOptions.

That wasn't always a case for edit mode.

This is absolutely to be included to 2.73

5 years agocleanup: style
Campbell Barton [Fri, 2 Jan 2015 08:18:57 +0000 (19:18 +1100)]
cleanup: style

5 years agoFix T43066: Joystick broken in GE since 2.73rc
Campbell Barton [Fri, 2 Jan 2015 06:12:39 +0000 (17:12 +1100)]
Fix T43066: Joystick broken in GE since 2.73rc

Caused by move to SDL2, fix thanks to jensverwiebe.

5 years agoFix same operator (curve.separate) in double in Curve menu.
Bastien Montagne [Thu, 1 Jan 2015 14:09:42 +0000 (15:09 +0100)]
Fix same operator (curve.separate) in double in Curve menu.

Reported by Leon Cheung on IRC, thanks.

5 years agocleanup: redundant casts & const cast correctness
Campbell Barton [Thu, 1 Jan 2015 12:26:03 +0000 (23:26 +1100)]
cleanup: redundant casts & const cast correctness

5 years agoSpaceFile: Cleanup: fix stupid indices in `filelist_from_main()`
Bastien Montagne [Thu, 1 Jan 2015 10:10:12 +0000 (11:10 +0100)]
SpaceFile: Cleanup: fix stupid indices in `filelist_from_main()`

Dead code (currently), but still...

5 years agoSpaceFile: Tweak thumbnail to avoid restarting the job needlessly.
Bastien Montagne [Wed, 31 Dec 2014 19:45:39 +0000 (20:45 +0100)]
SpaceFile: Tweak thumbnail to avoid restarting the job needlessly.

5 years agoSpaceFile: Refactor sorting and filtering of filelist.
Bastien Montagne [Wed, 31 Dec 2014 19:13:21 +0000 (20:13 +0100)]
SpaceFile: Refactor sorting and filtering of filelist.

New code shall be more easy to maintain and extend.
Sorting is now handled quite the same as filtering, and all filtering parameters
are now packed into a sub-struct to help extending it later.

Also done some optimizations in filelist refresh, and sorting/filtering area.
Now we should avoid re-sorting and re-filtering too often, also removed
calls to those in read_xxx funcs.

Note thumbnail job is still started basically on each call to `file_refresh()`,
will be addressed in next commit.

5 years agoSpaceFile: Filelist: reorder a bit things, also cleanup some unused and pure-private...
Bastien Montagne [Wed, 31 Dec 2014 18:17:20 +0000 (19:17 +0100)]
SpaceFile: Filelist: reorder a bit things, also cleanup some unused and pure-private funcs.

5 years agoFix T43079: Proxies of 100% size are ignored in sequencer
Sergey Sharybin [Thu, 1 Jan 2015 10:06:22 +0000 (15:06 +0500)]
Fix T43079: Proxies of 100% size are ignored in sequencer

5 years agoFix T43078: Strip custom proxy files did not respect color space settings
Sergey Sharybin [Thu, 1 Jan 2015 09:52:37 +0000 (14:52 +0500)]
Fix T43078: Strip custom proxy files did not respect color space settings

5 years agoAdd GPencil Copy/Paste to secondary pie + toolshelf
Joshua Leung [Wed, 31 Dec 2014 23:49:24 +0000 (12:49 +1300)]
Add GPencil Copy/Paste to secondary pie + toolshelf

5 years agoGPencil Editing: Copy and Paste selected stroke segments with Ctrl-C and Ctrl-V
Joshua Leung [Wed, 31 Dec 2014 23:36:01 +0000 (12:36 +1300)]
GPencil Editing: Copy and Paste selected stroke segments with Ctrl-C and Ctrl-V

5 years agoCycles: Post-reintegration tweaks to ensure things do compile
Sergey Sharybin [Wed, 31 Dec 2014 20:01:31 +0000 (01:01 +0500)]
Cycles: Post-reintegration tweaks to ensure things do compile

This commit contains all the tweaks which were missing in initial patch
re-integration from the standalone Cycles repository.

This commit also contains an utility cmake macro to help linking targets
with different libraries for release/debug builds, the name currently is

  target_link_libraries_decoupled

it gets a target and list of libraries and makes sure debug builds are
using libraries with "_d" suffix.

After all this changes it'll hopefully be easier to interchange patches
between blender and standalone repositories, because they're now quite
identical.