Blender Git Loki

Kaikki Blender Git kommitit.

Page: 5290 / 8462

October 10, 2014, 20:40 (GMT)
Restore double-up/down arrows icons.
October 10, 2014, 20:09 (GMT)
Merge branch 'master' into soc-2014-shapekey

Conflicts:
release/datafiles/blender_icons.svg
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_shapekey.c

Note about blender_icons.svg: blindly reset to master state, hard to do otherwise on such file... :/
October 10, 2014, 18:30 (GMT)
fix for: comparison with wrong rigidbody count caused deactivation of the cache and simulation was not cached any more
October 10, 2014, 16:45 (GMT)
Cleanup: tabs in empty lines.
October 10, 2014, 16:45 (GMT)
Cleanup (no functional changes):

* int -> bool where possible
* Use const where possible
* Get rid of magic numbers
* Add/tweak a few UI tips
* A few other misc changes.
October 10, 2014, 16:45 (GMT)
Fix T41950: Parent-Child Menu behaves weird

Issue was, parenting with operator, then unparenting would keep the inverse parent matrix.
So if you then parented again through the mere Object field of Object buttons, you'd still
use previous inver parent matrix, giving some weird behavior from user PoV.

This commit simply makes sure inverse parent matrix is always reset to indentity when clearing
parents.
October 10, 2014, 15:31 (GMT)
Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_image_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_render.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
October 10, 2014, 15:13 (GMT)
Code cleanup: Fix silly duplication of typecheck and swap macro
October 10, 2014, 15:02 (GMT)
Change interaction of pie menus slightly.

In drag style pie menus clicking is ignored now. This is done because
if we want to ensure that pie menus will not respawn, we had to not
destroy and keep the pie menu invisble while the button is pressed.

This opened a can of worms where pie items that would spawn popups could
steal the focus from the invisible pies and then the former pies would
be stuck in an invisible state, stealing all input unless user did a
right click to cancel the pie.

Invisible state is still kept for cancelling and strictly for that only.

This still allows nested layouts but only in click style, while hold
style is used for faster interaction. As a plus, it should also be
possible to tweak slider properties now, though menu will close after
that.
October 10, 2014, 14:52 (GMT)
Merge branch 'master' into depsgraph_refactor

Also made sure it compiles here.

Conflicts:
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/BLI_utildefines.h
source/blender/editors/space_info/CMakeLists.txt
source/creator/CMakeLists.txt
October 10, 2014, 14:29 (GMT)
dont use BLI_findlink for first shard (can access directly) and load shards into correct "parent" struct
October 10, 2014, 14:17 (GMT)
Code cleanup: tabs vs. spaces (tm) commit
October 10, 2014, 14:07 (GMT)
crash fix when fracturing, missed initalization of listbase and quiet some warnings
October 10, 2014, 13:55 (GMT)
replaced Shard pointer to arraypointer by ListBase for FracMesh->shard_map in DNA, for fracture modifier
October 10, 2014, 13:11 (GMT)
Fix typo breaking compilation with rather strict flags (does not like implicit double to float conversion).
October 10, 2014, 13:09 (GMT)
Fix T42163: Outliner: recursive visibility toggle: autokeyframe only works for ancestor, not children

Ancestor's autokeyframing is handled through UI/buttons code, but children completely
skipped this, so we have to do it explicitely here...
October 10, 2014, 12:55 (GMT)
Fix for invalid ID access during versioning.

For now is fixed by doing a versioning hack in the lib_link function,
but would be nicer to avoid this altogether for forward compatibility.
October 10, 2014, 11:40 (GMT)
Cycles: Use a bit better approach for erfinv()

Also reduce number of branching and multiplications a bit by inlining the branches.

This gives an unmeasurable speedup, which is in case of BMW is about 2% here.
October 10, 2014, 10:58 (GMT)
OSX: as an prerequisite to make Dalai's upcoming "area_fullsceen" work,
make sure the window states are correct in the lion_fs animation phase.
This also assures the CTX_wm_window(C) is okay.
October 10, 2014, 10:38 (GMT)
Sculpt: remove offset args from internal funcs

Detect this from the element type, also typecheck lookup functions
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021