April 2, 2015, 15:34 (GMT) |
Merge branch 'asset-experiments' into asset-engine Conflicts: source/blender/editors/space_file/filelist.c |
April 2, 2015, 15:29 (GMT) |
FileBrowser Preview: enhance handling of previews when modifying cache of entries... |
April 2, 2015, 15:13 (GMT) |
Fix T44183 particles in linked group offset from object A nice bug combining all the broken features of blender: Particles, duplis and multiple scene dependencies. Fortunately this was solvable: Basically, we need to make sure derivedmesh for dupli instance is generated before obmat is overriden. This also makes sense, since no instance has "true" obmat apart from original. Lazy initialization of derivedmesh just does not work here (or it -does- work but first use should be before instance drawing). Fingers crossed nothing else breaks after this... |
April 2, 2015, 15:11 (GMT) |
AssetEngine: Add needed API for new 'on demand' entries listing from FileBrowser. Also use that new API in filebrowser - only partially for now, at least it does not crash anymore even if 100% empty... |
April 2, 2015, 14:55 (GMT) |
Removing XXX MV: render_result_rescale is only called by view3d rendering, so it is fine to rescale only one rect |
April 2, 2015, 14:55 (GMT) |
Remove dead code (rna_Node_image_view_update) |
April 2, 2015, 14:39 (GMT) |
Fix for wrong pointer used in the modifier cache copy function. |
April 2, 2015, 14:31 (GMT) |
Multiview: Fix "mixed declarations and code" error |
April 2, 2015, 13:29 (GMT) |
Fixes needed to make it compile again. Remains broken though! |
April 2, 2015, 13:20 (GMT) |
Merge branch 'asset-experiments' into asset-engine Conflicts: source/blender/editors/space_file/filelist.c source/blender/editors/space_file/filelist.h source/blender/makesrna/intern/rna_internal.h Notes: * asset-experiments branch still needs some work (e.g. entires selection is to be reworked too), but was more than time to do a first merge... * This is raw merge, code is hence broken and needs more fixes to take into account new changes! |
April 2, 2015, 13:17 (GMT) |
Action Editor: Experimental tweak to ordering of buttons This commit is an experiment exploring the relationship between the action management buttons (i.e. action selector + pushdown/stash, and soon a few others) and the filtering stuff (i.e. summary, only selected, etc.) The old ordering meant that the filtering stuff was consistently in the same place beside the mode selector, meaning that the order was "common stuff, then editor specific stuff", this was not that great on smaller windows, where there important stuff was often out of view. This new order places greater emphasis on the parts which are likely to be more important. It also allows us to have a better hierarchy/flow; this is especially because we'll soon introduce a way to specify which datablock "level" the action comes from, so going from "level -> action -> filters within action" will make more sense. |
April 2, 2015, 13:17 (GMT) |
Code Cleanup: Split Action management operator stuff into action_data.c |
April 2, 2015, 13:03 (GMT) |
Force calculation function for strands (only gravity atm). |
April 2, 2015, 12:53 (GMT) |
Merge branch 'master' into asset-experiments |
April 2, 2015, 12:51 (GMT) |
Cleanup: followup to rBf87d7c605dcfb - use __func__ instead of literal func name in string. Since we are already using BKE_reportf... This way, no more issue if/when we copy/paste or rename that! |
April 2, 2015, 12:41 (GMT) |
FileBrowser: cleanup. Get rid of cache iterator code (not needed, and don't think we'll need it later, easy to add back if needed). Also comment some debug prints. New preview (thumbnails) handling seems to be working pretty nice now. |
April 2, 2015, 12:29 (GMT) |
Removing XXX MV: implement RE_layer_load_from_file() - for one view only |
April 2, 2015, 12:09 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview |
April 2, 2015, 12:08 (GMT) |
Fix error messages for RE_layer_load_from_file() and RE_layer_load_from_file() |
April 2, 2015, 12:06 (GMT) |
FileBrowser: Fix stupid cache clear on each redraw while previews where updating. Missing 'need filter' flag clearing... |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021