Blender Git Loki

Squashed commit of the following:

commit 36652982dd7cabf803ba4895d0c996685aafc8ca
Merge: a54d863 20a1778
Author: Severin <[email protected]>
Date: Mon Dec 1 17:35:11 2014 +0100

Merge branch 'master' into ime

commit a54d863a93348e19a06b6aa7978e7befd4ea89cc
Author: Severin <[email protected]>
Date: Mon Dec 1 17:20:13 2014 +0100

IME: Fix IME not ending composition after region change

+ adding some asserts

commit cce89d04ee10ad2c1e863327884f135dacca22b6
Merge: d399927 3bd4690
Author: Severin <[email protected]>
Date: Mon Dec 1 15:25:05 2014 +0100

Merge branch 'master' into ime

commit d399927749c4d222bf3f0ac623880ec4e8626bc8
Author: Severin <[email protected]>
Date: Mon Dec 1 15:12:24 2014 +0100

IME: Deduplicate wmImeData + minor cleanup

* deduplicate use of wmImeData
* add missing "ifdef WITH_INPUT_IME"s
* usual minor cleanup

commit 80496abbf49a46f1e178ccb24d23403f94bea37b
Author: Severin <[email protected]>
Date: Sun Nov 30 20:06:29 2014 +0100

Minor cleanup

Adressing some of the inline comments from @sergey and @campbellbarton

commit b2a5b96ff48770be20e6afa1f843e032c797a412
Merge: 4fc691f b12dbdd
Author: Severin <[email protected]>
Date: Sun Nov 30 16:28:02 2014 +0100

Merge branch 'master' into ime

commit 4fc691f619c64a1740747aa161391060212c7405
Merge: 316bae9 f1ea1da
Author: Severin <[email protected]>
Date: Wed Nov 26 00:47:09 2014 +0100

Merge branch 'master' into ime

commit 316bae9fe859b11820d3fcbf3ae362afbde70d61
Author: Severin <[email protected]>
Date: Wed Nov 26 00:34:24 2014 +0100

General Review Changes

Main changes:
* avoid using MEM_mallocN on every redraw
* continue implementation of WITH_INPUT_IME CMake flag
* whitespace and code style cleanups

commit 3e5962656a3778a9d8e6eca02f11284636880633
Merge: 1087b92 aa0b268
Author: Severin <[email protected]>
Date: Mon Nov 24 22:19:53 2014 +0100

Merge remote-tracking branch 'origin/master' into ime

Conflicts:
source/blender/editors/space_node/node_add.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_view3d/view3d_edit.c

commit 1087b9236f5c42f5c497bd5d62787a55f64ebb69
Author: Severin <[email protected]>
Date: Mon Nov 24 00:27:36 2014 +0100

Merge branch master into input_method_editor

commit a677da8638c95422db21bf50cf71de092e3c3b59
Author: Severin <[email protected]>
Date: Tue Nov 18 20:05:05 2014 +0100

Finish support for CMake flag WITH_INPUT_IME

Note: implementation not finished, needs a bit cleanup

commit b5cf3cd415b815e335713232339aa7d71ba25ae7
Author: Severin <[email protected]>
Date: Tue Nov 18 15:57:03 2014 +0100

Cleanup: Moar whitespace cleanup, plus remove missed printf

Hope that was the last cleanup commit for now :/

commit f65879fd51b6d1aaebe52bcd32c125a17a8984e6
Author: Severin <[email protected]>
Date: Mon Nov 17 23:57:27 2014 +0100

Add missing files

commit ff27b12904b170e146065fe15734844a384a1ced
Author: Severin <[email protected]>
Date: Mon Nov 17 23:28:59 2014 +0100

Cleanup: Whitespace, Comments, etc.

It may be a bit early to do such cleanups, there are more important things
to do first, but those things are extremely time consuming and I wanted to
get rid of them first ;)

commit 30654e186fb665024669c489bc4524c01ceb52d1
Author: Severin <[email protected]>
Date: Mon Nov 17 18:18:11 2014 +0100

set up ime branch

commit 60a035c52addad3d2c97d82b4b91fbe2587805f0
Author: Severin <[email protected]>
Date: Mon Nov 17 18:18:11 2014 +0100

set up ime branch

commit fde03ec5789be41731db82d72394fdc50fc3ba10
Author: Campbell Barton <[email protected]>
Date: Sun Nov 23 22:00:26 2014 +0100

Minor edits to T42649 fix

- only modify paths for newly loaded images
- don't attempt to read from library paths

commit 0f159b730669595ff81c477e4de4cc826a7f2c3c
Author: Bastien Montagne <[email protected]>
Date: Sun Nov 23 20:51:08 2014 +0100

Fix BLI_Bitmap - was not usable in BKE area (strict compile flags).

commit 98beae0c110ecbcdf9c42d1ef87a5da7b9f202f9
Author: Bastien Montagne <[email protected]>
Date: Sun Nov 23 20:49:34 2014 +0100

Fix freestyle compile.

Do not know why this shows up now, probably a recent tweak in BLI_utildefines.h or so...

commit b68166355ac5e046cb1033123798277a081a2811
Author: julianeisel <[email protected]>
Date: Sun Nov 23 19:38:27 2014 +0100

Fix T42649: Use Relative Paths for Node Editor & 3D View Images

Images are now added with relative paths to the Node Editor and the 3D View.

commit 2bf7215130d3ef7d5f12aad810ebef4ed7fd44c8
Author: Campbell Barton <[email protected]>
Date: Sun Nov 23 15:54:29 2014 +0100

Refactor: BLI_path_util (part 2)

Use BKE_appdir/tempdir naming prefix for functions extracted from BLI_path_util

commit 14502a355784410c1dcd67755c05e518b38f1fab
Author: Campbell Barton <[email protected]>
Date: Sun Nov 23 14:37:13 2014 +0100

Refactor: BLI_path_util (split out app directory access)

This module is intended for path manipulation functions
but had utility functions added to access various directories.

commit e0283f8b6c2926cb0d4eb9021697bcab645924be
Author: Campbell Barton <[email protected]>
Date: Sun Nov 23 15:13:58 2014 +0100

Cleanup: warnings

commit fffc35c34a5537263fe4d637328ef0383231e88b
Author: Thomas Dinges <[email protected]>
Date: Sat Nov 22 20:21:18 2014 +0100

Cycles UI: Several fixes for recent additions...

* Alpha Property was removed (Fix T42690)
* Some tweaks to make the panel look better again.
* Use abreviated form "Multiple Importance" everywhere, for consistency.

commit 8299602f1f3980515c94fac39ebf9b919e9f2874
Author: Campbell Barton <[email protected]>
Date: Sat Nov 22 18:11:46 2014 +0100

Math Lib: add constant: M_SQRT1_3 1/sqrt(3)

commit 3d6b91229370e3e25964a41125ea93a4c68e0fed
Author: Bastien Montagne <[email protected]>
Date: Sat Nov 22 14:39:53 2014 +0100

Fix T42688: python crash: bpy.context.scene.update().

`ED_render_scene_update()` should ensure it does have some WM to work on...

commit 4a55637a0da4257072f2182c1955af9dbfb78657
Author: Joshua Leung <[email protected]>
Date: Sat Nov 22 18:04:08 2014 +1300

Bugfix T42549: Grease pencil layers are not scene-specific for "full copy scenes"

commit 4135458c3d30b2ab71b53950903bc8fcaef8efb3
Author: Joshua Leung <[email protected]>
Date: Sat Nov 22 18:03:37 2014 +1300

Fix for previous commit

gpencil_data_duplicate() was being used for gp drawing undo buffers, where using an
exact copy is exactly what we want/need. Instead, the code here now has an additional
arg for determining whether a direct copy is warranted or not.

commit c3eab0e2f4c8b6b1b2c62727358f936d2147604f
Author: Joshua Leung <[email protected]>
Date: Sat Nov 22 01:52:28 2014 +1300

Bugfix: Duplicating Grease Pencil datablocks wasn't doing so in a safe way

Grease Pencil data (bGPdata) is now a datablock, so it isn't safe to use
MEM_dupallocN() for copying new instances of these anymore.

commit 9901eed588a8b0f6ae2de02dfa2b0c15e7a98992
Author: Antony Riakiotakis <[email protected]>
Date: Fri Nov 21 21:39:52 2014 +0100

Fix leftover f postfix from C code.

commit 48b3a09c4199a0f30a4fed8f9a6163d5af98a23c
Author: Campbell Barton <[email protected]>
Date: Fri Nov 21 21:22:31 2014 +0100

Text Editor: incorrect clipping at bottom

Patch T42637 by @donfabio

commit ea671a6e872e68c41ff186a7b16f869704d6f414
Author: Gaia Clary <[email protected]>
Date: Fri Nov 21 16:01:18 2014 +0100

fix T42676 replaced windows specific include by BLI_utildefines.h

commit a36778ab8e519098880fb34136b1016849bbf36f
Author: Campbell Barton <[email protected]>
Date: Thu Nov 20 21:38:05 2014 +0100

BMesh: check for loop side-of-loop & side-of-edge

commit b4337e870e52200f7eb5e66f77333f87d0f6ca2a
Author: Campbell Barton <[email protected]>
Date: Fri Nov 21 14:14:50 2014 +0100

Cleanup: typo

commit ed01da08fdad9f7740da16d32948643bf4365d4c
Author: Antony Riakiotakis <[email protected]>
Date: Fri Nov 21 14:07:25 2014 +0100

Cycles: support for specular color in solid shading mode, available in
the material panel.

Patch by Phillipp Oeser (D62) with some minor modifications, thanks!

commit e2855b81a482a2dbace648ff2d8e40c0f123b4c3
Author: Joshua Leung <[email protected]>
Date: Sat Nov 22 01:29:32 2014 +1300

Bugfix T42048: Keyframes missing when animating particle system blend texture parameters

Textures attached to particle systems are now get their animation data listed
under the particle systems they are attached to now. This is the most convenient
and direct way that these can get included

commit 6650436d4adcb54a1dfcdd716746dc30961651f9
Author: Campbell Barton <[email protected]>
Date: Fri Nov 21 13:07:18 2014 +0100

CMake: disable OSL if its not found

commit e2e69f6011705c02f9839a75823fc5f3a385ffb8
Author: Joshua Leung <[email protected]>
Date: Sat Nov 22 00:55:57 2014 +1300

Bugfix T41527: Animations of world texture properties invisible in anim editors

Was caused by a typo - "items" was used in place of "tmp_items", causing animation
in the texture to get ignored if nothing else was present

commit 6147ad35962a55f5a97f9847454dc6def383067b
Author: Joshua Leung <[email protected]>
Date: Sat Nov 22 00:43:41 2014 +1300

Bugfix T42648: Invert Selection operator is not working for animation channels

The wrong selection mode was being used/passed to operators.

commit b0ea6aecb3582e223b85e0cc336b5afcc8600ede
Author: Bastien Montagne <[email protected]>
Date: Fri Nov 21 12:26:13 2014 +0100

Fix T42421: HDR reader could easily read past buffer (truncated HDR files e.g.) and segfault.

Now readers get an 'mem_eof' guard pointer, and they abort in case they try to go past it.

commit a7536dfac5b33486be769dad68c164af04d4167c
Author: Sergey Sharybin <[email protected]>
Date: Fri Nov 21 11:31:30 2014 +0100

Task scheduler: Add an option to limit number of threads per pool

This way we can have scheduler capable of scheduling tasks on all the CPUs
but in the same time we can limit tasks like baking (in the future) to use
no more than given number of threads.

commit d4726517135fe3b7d98926ca59e1894fe329f1b2
Author: Sergey Sharybin <[email protected]>
Date: Thu Nov 20 21:05:03 2014 +0100

Compsitor: White space cleanup

commit 808c6e383bb10fa1181aea1cec8d255bf2ce6a38
Author: Bastien Montagne <[email protected]>
Date: Thu Nov 20 20:23:13 2014 +0100

Cleanup: ints/shorts -> bool.

commit 70dee80a8b74ce0a16f2d7d1bad30fa6a1f66fd9
Author: Antony Riakiotakis <[email protected]>
Date: Thu Nov 20 19:43:32 2014 +0100

Fix T42622, environment texture GLSL result different from rendering.

Also included mirror ball shader, which was missing.

commit 77447f0401f09eacf267daf987e6835313076e5e
Author: Antony Riakiotakis <[email protected]>
Date: Thu Nov 20 18:58:24 2014 +0100

Fix T42639, editcurve flags not getting restored on undo.

Error here could be reproduced by tweaking curve properties such as
2d-3d or fill type and undoing.

commit 157e6ef22df00af72cbd9d7ebc377cb27e2db47c
Author: Antony Riakiotakis <[email protected]>
Date: Thu Nov 20 18:11:12 2014 +0100

Fix T42662 hide unselected does not reveal selected.

Not sure if this is a bugfix exactly but should help the gooseberry team
with their workflow.

commit 78b91eb23fabaf4231bad4e71e3ad6f1334d1ecc
Author: Antony Riakiotakis <[email protected]>
Date: Thu Nov 20 17:44:47 2014 +0100

Fix T42660 snapping not working nicely on graph editor.

Basically, get the grid increments and reuse them when snapping. System
is slightly crappy here, we should calculate those factors only once,
but leaving as todo for later.

commit c6b2422db0763a5aeae6562537163f22e682f084
Author: Antony Riakiotakis <[email protected]>
Date: Thu Nov 20 15:43:41 2014 +0100

Fix color tweaking in vertex painting not getting an undo push (would
cause color reset between strokes)

commit d6931a6ce6b53ec068dda808078d2ef230216ae9
Author: Antony Riakiotakis <[email protected]>
Date: Thu Nov 20 15:26:58 2014 +0100

Fix T42647, vertex and weight painting mode do not display solid shaded
when VBOs is off.

commit d5e0613d6eb05a729fdeddb6078dc5c3a31f3c5e
Author: Sergey Sharybin <[email protected]>
Date: Thu Nov 20 15:27:10 2014 +0100

SCons: Proper solution for local symbols map

Configuration used to override the link flags, it better restore them
once the configuration is done.

commit 6a6336ce77365b3f3ef8be3bef2a40e33f9d2093
Author: Bastien Montagne <[email protected]>
Date: Thu Nov 20 14:57:35 2014 +0100

Fix T42638: Roll angle inconsistent flip in edit mode.

Basically, `angle_compat_rad()` was completely broken -
example of result it could produce:

| new angle | compat angle | result
| -0.000000 | 3.141593 | -> 3.141593

... Where 0.0 (or 2 * PI) would be expected!

commit e0b960a77e51e18301bf5b0e1932932e92a730db
Author: Sergey Sharybin <[email protected]>
Date: Thu Nov 20 18:54:41 2014 +0500

Cycles: Remove dynamic library helper files

They were only needed for CUDA wrangler. Since we've switched to CUEW
this utility functions are no longer needed.

commit 7bd15aa34785f17b54940daca7b9617f7e23d7f1
Author: Sergey Sharybin <[email protected]>
Date: Thu Nov 20 18:30:13 2014 +0500

Cycles: Fix typo on graphiz graph dumper

commit bbe68ddf7ecf2088adc6e20e73c248c5f360d197
Author: Joshua Leung <[email protected]>
Date: Fri Nov 21 01:43:56 2014 +1300

Bugfix T42661: shortcut "." and "," for changing pivot center don't work on Graph Editor

commit 339147666aa2b2ccfdb83874f4a3ab7776596990
Author: Sergey Sharybin <[email protected]>
Date: Thu Nov 20 15:28:37 2014 +0500

SCons: Remove duplicate PLATFORM_LINKFLAGS from makesdna and makesrna

Hopefully it'll fix "anonymous version tag cannot be combined with other version"
compilation error.

commit 716642379f774e28084d36f4e5ff2849e9d853d9
Author: Campbell Barton <[email protected]>
Date: Thu Nov 20 11:03:38 2014 +0100

mathutils.kdtree: fix docstrings

commit b6192bfa3be5c564d2f3ce5744b2fd65e64e81fb
Author: Thomas Dinges <[email protected]>
Date: Thu Nov 20 07:53:22 2014 +0100

Cleanup: Remove SD_BSDF_GLOSSY flag, unused.

commit 15a212ee0681e01710f6b79c4fb125c1f9573235
Author: Bastien Montagne <[email protected]>
Date: Wed Nov 19 20:48:35 2014 +0100

Cleanup: #define -> enums.

commit d813f70382f9f0919af8caf55e147a21e9c960ac
Author: Sergey Sharybin <[email protected]>
Date: Wed Nov 19 19:41:41 2014 +0100

Switch to SDL2 on OSX

commit 3e5de9dc3fbae537a41ed92c7f33d94f2d7d1ac7
Author: Joshua Leung <[email protected]>
Date: Thu Nov 20 03:07:09 2014 +1300

Fix: Shift-H now works in main graph editor area too

In the process, I've removed the old operator (ANIM_OT_channels_visibility_set)
and folded that option in with the hide operator, to make this consistent
with how this is done in the 3D view and other parts of Blender.

commit 656b868db927bf9311c3fe3747a96039316e28a5
Author: Joshua Leung <[email protected]>
Date: Thu Nov 20 02:46:45 2014 +1300

Tweaks to hide/reveal hotkeys for Graph Editor

Now the hotkeys here work in line with what's done for other parts of Blender
* H = Hide selected
* Shift-H = Hide unselected (i.e. old VKEY behaviour)
* Alt-H = Reveal all

commit aee3d19082e9f0c0a69d1e6de795dbeeef290545
Author: Campbell Barton <[email protected]>
Date: Wed Nov 19 14:35:00 2014 +0100

Cleanup: name hide/reveal, like rest of operators

commit 56d4aed17d3b118b2b8e504fe3df19e2c5f96772
Author: Joshua Leung <[email protected]>
Date: Thu Nov 20 02:24:42 2014 +1300

Graph Editor: H/Shift-H now hide and unhide selected curves (Gooseberry Request)

Revised the tools for managing which FCurves are visible in the Graph Editor
curves area. Now, there are the following tools in place:
* V (channels region only) = Hide all curves except those in selected channels [OLD]

* H = Hide all selected curves [NEW]
* Shift-H = Show all previously hidden curves [NEW]

I've removed the old operator to toggle visibility status of selected curves,
as it doesn't seem that useful anymore.

commit c6acfdf2a0464b4437cfaa43cc3b951c2f2909bf
Author: Bastien Montagne <[email protected]>
Date: Tue Nov 18 23:52:17 2014 +0100

Refactor: Move part of vgroup handling code from ED_mesh/object_vgroup.c to BKE_object_deform.

Along with some minor cleanup and simplifications.

Reviewers: campbellbarton

Subscribers: sergey

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

commit baccf320767144d97253e0d9c8e39e58c4802978
Merge: e42f974 d06b1a5
Author: Severin <[email protected]>
Date: Tue Nov 18 23:12:09 2014 +0100

Merge branch 'master' of git.blender.org:blender into input_method_editor

commit e42f974ae6056f4aaebca819222a12f1b9040396
Author: Severin <[email protected]>
Date: Tue Nov 18 20:05:05 2014 +0100

Finish support for CMake flag WITH_INPUT_IME

Note: implementation not finished, needs a bit cleanup

commit 122ad8ac6d8d0936178663f30b71eaccc134f88d
Author: Severin <[email protected]>
Date: Tue Nov 18 15:57:03 2014 +0100

Cleanup: Moar whitespace cleanup, plus remove missed printf

Hope that was the last cleanup commit for now :/

commit f086c5a1ea400cd4808955eb817e3bb9b513c548
Author: Severin <[email protected]>
Date: Tue Nov 18 01:44:12 2014 +0100

CMake: add WITH_INPUT_IME option + various fixes/cleanup

*note:* implementation of WITH_INPUT_IME is only halfway finished, you'll
get build errors if you disable it

commit c4b7440bc02e91885e9111942d2397a8072885e7
Author: Severin <[email protected]>
Date: Tue Nov 18 00:02:47 2014 +0100

Cleanup: Whitespace before comments

Missed that in rB23c7716bbbdef99

commit 7d281401fd187dfbb9b8dd203f4468901db2bfe4
Author: Severin <[email protected]>
Date: Mon Nov 17 23:57:27 2014 +0100

Add missing files

commit 23c7716bbbdef9958274e19f03be201d34506a1b
Author: Severin <[email protected]>
Date: Mon Nov 17 23:28:59 2014 +0100

Cleanup: Whitespace, Comments, etc.

It may be a bit early to do such cleanups, there are more important things
to do first, but those things are extremely time consuming and I wanted to
get rid of them first ;)

commit 98f03331104c2e497c8553ec33fff666060345ab
Author: Severin <[email protected]>
Date: Mon Nov 17 18:30:01 2014 +0100

Cleanup: Use *win instead of *window (moar consistent)

commit 7907014ed7da132fc88ec1b9dcb8b573ec9dd22a
Author: Severin <[email protected]>
Date: Mon Nov 17 18:18:11 2014 +0100

set up ime branch