Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-24Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/windowmanager/intern/wm_files_link.c
2016-07-19Add 'reload' function to libraries' RNA API.Bastien Montagne
2016-07-16Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/windowmanager/intern/wm_init_exit.c
2016-07-15Fix py-driver in startup.blend crash in background modeCampbell Barton
Obscure regression in own commit from b34929786. While this could be considered correct, it introduces a crash so disable the update call.
2016-07-12writefile: reuse SDNA between writesCampbell Barton
Avoids decoding the SDNA string every undo step.
2016-07-11Fix T48812: Brush size invalid with HIDPICampbell Barton
Missed from c5b2f12b
2016-07-07Quiet gcc warning-as-error about non-const pointer passed to const parameter.Bastien Montagne
2016-07-07Fix T48802 Unwrap buttons, can't add hotkey in 3DView's UV Unwrap menu.Bastien Montagne
Those unwrap operators are a bit tricky, some are available from both 3DView and UVEditor, others only from 3DView... Hacked around this by returning Mesh keymap for UV_OT ops for specific 3DView/MeshEditMode context.
2016-07-07Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/blenloader/intern/readfile.c
2016-07-06Replace of (id->lib != NULL) check by meaningful macro.Bastien Montagne
Idea is to replace hard-to-track (id->lib != NULL) 'is linked datablock' check everywhere in Blender by a macro doing the same thing. This will allow to easily spot those checks in future, and more importantly, to easily change it (see work done in asset-engine branch). Note: did not touch to readfile.c, since there most of the time 'id->lib' check actually concerns the pointer, and not a check whether ID is linked or not. Will have a closer look at it later. Reviewers: campbellbarton, brecht, sergey Differential Revision: https://developer.blender.org/D2082
2016-06-30Reduce re-allocation while fetching UUIDs per asset engine (asset reload area).Bastien Montagne
2016-06-29Cleanup: rename BKE_asset to BKE_asset_engine.Bastien Montagne
Since this file mostly defines/handles interactions with asset engines... Asset handling itself is more done in library area (will split it too in next commit).
2016-06-29Merge branch 'master' into asset-engineBastien Montagne
2016-06-29Cleanup: spelling, indentationCampbell Barton
2016-06-27Merge branch 'master' into asset-experimentsBastien Montagne
Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenkernel/intern/brush.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/mesh.c source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/space_action/space_action.c source/blender/editors/space_clip/space_clip.c source/blender/editors/space_file/filelist.c source/blender/editors/space_graph/space_graph.c source/blender/editors/space_image/space_image.c source/blender/editors/space_logic/space_logic.c source/blender/editors/space_nla/space_nla.c source/blender/editors/space_node/space_node.c source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_sequencer/space_sequencer.c source/blender/editors/space_text/space_text.c source/blender/editors/space_view3d/space_view3d.c source/blender/makesrna/intern/rna_ID.c source/blender/makesrna/intern/rna_main_api.c source/blender/windowmanager/intern/wm_files_link.c source/blender/windowmanager/wm_files.h
2016-06-25Cleanup: remove bad-level callCampbell Barton
2016-06-25GPU: move select index code out of WMCampbell Barton
This avoids bad-level calls.
2016-06-24BKE_blender: Add own atexit functionsCampbell Barton
Runs before guarded-alloc leaks print.
2016-06-23Dopesheet: Lasso and Circle Select tools work for selecting keyframesJoshua Leung
This only works in the Action and Dopesheet modes (which operate on FCurve keyframes). Support for Grease Pencil and Mask Keyframes though is still pending.
2016-06-22ID-Remap, step two: add some user-level tools.Bastien Montagne
This commit adds operators and Outliner menu entries to reload or relocate a library, and to delete or replace a datablock. RNA ID API is also extended to allow ID deletion and remapping from python. Review task: D2027 (https://developer.blender.org/D2027). Reviewed by campbellbarton, thanks a bunch.
2016-06-22ID-Remap - Step one: core work (cleanup and rework of generic ID datablock ↵Bastien Montagne
handling). This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock was pretty much impossible, except for a few special cases. Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite a few ID usages were missed or wrongly handled that way). One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling by using library_query utils to allow generic handling of those, which is now the case (now, generic ID links handling is only "knwon" from readfile.c and library_query.c). This commit also adds backends to allow live replacement and deletion of datablocks in Blender (so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one, or NULL one in case of unlinking). This will allow nice new features, like ability to easily reload or relocate libraries, real immediate deletion of datablocks in blender, replacement of one datablock by another, etc. Some of those are for next commits. A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core. Though it was tested rather deeply, being totally impossible to check all possible ID usage cases, it's likely there are some remaining issues and bugs in new code... Please report them! ;) Review task: D2027 (https://developer.blender.org/D2027). Reviewed by campbellbarton, thanks a bunch.
2016-06-21Fix T48700: Crash when window creation failsCampbell Barton
Check if Python is initialized before calling BPY_python_end.
2016-06-21Fix T48196: Crash enabling modal operator in execCampbell Barton
Not good practice, but better not crash.
2016-06-17Merge branch 'id-remap' into asset-experimentsBastien Montagne
Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenkernel/intern/library.c
2016-06-16Fix reload/relocate trying to use invalid lib path.Bastien Montagne
2016-06-16Cleanup from review comments.Bastien Montagne
2016-06-16Move remapping functions into BKE_library_remap.hCampbell Barton
This is done since remapping is quite an involved process.
2016-06-14Fixes/updates needed to make asset reload work with new virtual lib stuff.Bastien Montagne
2016-06-14Merge branch 'asset-engine' into asset-experimentsBastien Montagne
2016-06-14Cleanup.Bastien Montagne
2016-06-14Cleanup: move 'virtual lib' linking code into own helper.Bastien Montagne
2016-06-13WIP experimental support of direct image-as-linkeddata.Bastien Montagne
Works okish, but break on load (or save) of .blend file currently...
2016-06-13First step towards supporting non-blender-data as assets.Bastien Montagne
Idea is to avoid the need for asset engines to generate whole .blend files with relevant datablocks in case they just need/want to provide files (images, videos, sounds...). This commit introduces the concept of 'virtual' library, which in fact only exists to store asset repository data. Datablocks from those virtual libs are then fully written in .blend file. Much to do still, this is only preliminary/experimental work.
2016-06-13Some minor fixes/enhancements.Bastien Montagne
Asset engines are now only selectable and used in link/append case. Makes no real sense to have those in other cases (like regular file opening, or even worse when saving a file!). Also allows to get back asset engine persistance accross filebrowser usage.
2016-06-13Merge branch 'master' into asset-experimentsBastien Montagne
2016-06-13Merge branch 'master' into asset-engineBastien Montagne
2016-06-13Merge branch 'master' into id-remapBastien Montagne
2016-06-08GPU: avoid disabling basic-shader for lassoCampbell Barton
Replace glDrawPixels w/ glaDrawPixelsTex
2016-06-08Make uiLists placed in popups usableJulian Eisel
It's still not completely working - there are still some glitches - but far better than before. To make buttons of the uiList work, you have to add a 'check' callback to the operator that invokes the menu. Only if it returns True, the uiList gets refreshed. To avoid this we have to make the region refresh tagging in the entire button handling a bit smarter. Changes I had to do: * Call uiList handling from menu/popup handling if needed. * Make uiList handling use special popup refresh tag if placed in menu. * Allow popups invoked from py operator to tag for refresh by using operator 'check' callback. * Tag popup for refresh when resizing uiList. Mostly fixes T48612.
2016-06-08Cleanup: Add comment on behavior of tweak eventsJulian Eisel
It's not obvious that they use the mouse coordinate of the initial key-press event (behavior since rBf1f33ba7be2d), so added comment. Also corrected other comments.
2016-06-07GPU: Fix triple buffer w/ basic glsl shaderCampbell Barton
Needed to add GL_TEXTURE_RECTANGLE support to basic-shader.
2016-06-07GPU: Fix for glDrawPixels drawing w/ glsl shaderCampbell Barton
The basic shader needs to be temporarily disabled in this case. Add macros for temp store/restoring the state.
2016-06-07Merge branch 'id-remap' into asset-experimentsBastien Montagne
Conflicts: source/blender/makesdna/DNA_ID.h
2016-06-07Merge branch 'master' into asset-engineBastien Montagne
Conflicts: source/blender/makesdna/DNA_ID.h
2016-06-07Merge branch 'master' into id-remapBastien Montagne
Conflicts: source/blender/blenloader/intern/readfile.c
2016-06-01Usual UI/i18n message cleanup (get rid of last remaining 'addon' too).Bastien Montagne
2016-05-31Cleanup: parenthesize definesCampbell Barton
2016-05-31Merge branch 'id-remap' into asset-experimentsBastien Montagne
2016-05-31Merge branch 'master' into asset-engineBastien Montagne
2016-05-31Merge branch 'master' into id-remapBastien Montagne