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
path: root/source
AgeCommit message (Collapse)Author
2016-07-12Merge branch 'master' into asset-experimentsBastien Montagne
Conflicts: source/blender/blenloader/intern/readfile.c source/blender/windowmanager/intern/wm_init_exit.c
2016-07-12Fix T48830: Outliner draw crash, missing NULL checkCampbell Barton
Fix from @cheleb
2016-07-12writefile: reuse SDNA between writesCampbell Barton
Avoids decoding the SDNA string every undo step.
2016-07-12readfile: report SDNA decoding errors on file readCampbell Barton
This was printed to the stdout, however the error case wasn't checked or well supported. Also, errors decoding SDNA would sometimes call exit(1).
2016-07-12writefile: remove SDNA last-hit, optimize DNA reconstructCampbell Barton
- Move last-hit index out of SDNA struct (allows for access by multiple threads). - Replace O(n^2) search with hash lookup in DNA reconstruction.
2016-07-11Remove usercount handling from BKE_id_expand_local.Bastien Montagne
Idea looked good, but we have too much custom situations here (some half-fake-sub-ID being copied with their 'owner', animdata, etc.), let's let datablock copy functions handle that themselves. Also allows to safely call BKE_id_expand_local from all copy functions now (only when copying linked data).
2016-07-11Cleanup: remove call to BKE_id_lib_local_paths() in make_local functions.Bastien Montagne
This one is already called by matching copy functions, no need to call it twice!
2016-07-11Use new generic BKE_id_expand_local() for make_local() for object.Bastien Montagne
2016-07-11Use new generic BKE_id_expand_local() for make_local() for ↵Bastien Montagne
image/material/texture/world. As said in previous commits, did not touch to copy functions for now, due to ntree issues...
2016-07-11Revert 'use new BKE_id_expand_local()' change for Lamp's copy function.Bastien Montagne
ntree is once more time a PITA - actually, all sub-IDs that get copied together with the 'main' one are (shapekey was workedaround, as was animdata/action issue, but nodes are more touchy). For now, better not to touch that, needs careful check & rethink.
2016-07-11Use new generic BKE_id_expand_local() for make_local() for nodetree.Bastien Montagne
Did not changed ntree copy for now, this func is a mess of expand/non-expand/bmain/non-bmain cases... Keep it for later!
2016-07-11Use new generic BKE_id_expand_local() for both make_local() and copy() ↵Bastien Montagne
functions of actions, brushes and particles. This greatly simplifies said code, once again no change expected from user PoV.
2016-07-11Use new generic BKE_id_expand_local() for both make_local() and copy() ↵Bastien Montagne
functions of obdata (armature, mesh, curve, mball, lattice, lamp, camera, and speaker). This greatly simplifies said code, once again no change expected from user PoV.
2016-07-11Add an exception/hack to new BKE_id_expand_local(), to ignore actions ↵Bastien Montagne
datablock in its usercount handling. Reason is, typically those actions datablock usercounts have already been adjusted in BKE_animdata_copy() (called by generic iddata copy function). Think this needs to be reworked a bit too, there are way too much ways to copy animdata currently, it's rather confusing. But not the goal here, so for now we'll live with the hack!
2016-07-11Fix (unreported) memory leak when making local linked databock which has a ↵Bastien Montagne
preview image. Also cleaned-up/synchronized code across al ID types that support preview.
2016-07-11Add generic 'BKE_id_expand_local' to BKE_library,Bastien Montagne
will be used by both make_local() and copy() datablock functions. Note that this new func make 'extern' all IDs used by localized datablock, not only refcounted ones as it used to be in each type's functions (with a few exceptions).
2016-07-11Fix T48812: Brush size invalid with HIDPICampbell Barton
Missed from c5b2f12b
2016-07-11Depsgraph: Fix crash in Weight VG modifierSergey Sharybin
2016-07-11Depsgraph: Fix shape key nodes trying to be added multiple timesSergey Sharybin
2016-07-11Cleanup: line lengthCampbell Barton
2016-07-11Dyntopo: fix lop-sided edge collapseCampbell Barton
When an edge was collapsed, one of the vertices would be removed. Edges attached to the deleted vertex wouldn't be considered for collapsing again, making the outcome from collapsing edges depend on the edge-vertex order. Use a hash to lookup the final vertex when collapsing edges, instead of skipping them.
2016-07-11Fix sculpting high poly meshesCampbell Barton
Attempted to free unallocated memory, interestingly nobody noticed this for ~7 years (error from 3078c806).
2016-07-11Dyntopo: possible modified option was incorrectly setCampbell Barton
2016-07-11Dyntopo: remove redundant existing face checkCampbell Barton
Gives minor speedup
2016-07-11BLI_math: move interp_*_cubic to its own functionCampbell Barton
2016-07-10Fix T48822: Crash when I try to use "Join" (Ctrl Key + J) with two meshes.Bastien Montagne
Own stupid typo in recent refactor work...
2016-07-10Refactor/enhance BKE_action_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-10Refactor/enhance ntreeMakeLocal().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-10Refactor/enhance BKE_image_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-10Refactor/enhance BKE_material_make_local() and BKE_image_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-10Refactor/enhance BKE_lamp_make_local() and BKE_camera_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-10Refactor/enhance BKE_brush_make_local() and BKE_speaker_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-10Refactor/enhance BKE_particlesettings_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-11Add missing bracesCampbell Barton
2016-07-10Fix T48815: Translate node's 'Relative' checkbox has the same tooltip as ↵Philipp Oeser
blur node's 'Relative' checkbox. Differential Revision: https://developer.blender.org/D2099
2016-07-10Cleanup/Refactor: pass Main pointer to all ID copy functions.Bastien Montagne
Also allows us to get rid of a few _copy_ex() versions...
2016-07-09Add BKE_key_copy_ex() that takes a Main as parameter.Bastien Montagne
2016-07-09Refactor/enhance BKE_lattice_make_local(), and add BKE_lattice_copy_ex() ↵Bastien Montagne
that takes a Main as parameter. Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-09Refactor/enhance BKE_mball_make_local(), and add BKE_mball_copy_ex() that ↵Bastien Montagne
takes a Main as parameter. Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-09Refactor/enhance BKE_curve_make_local(), and add BKE_curve_copy_ex() that ↵Bastien Montagne
takes a Main as parameter. Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6).
2016-07-09Cleanup to shapekeys' make_local (and copy) functions.Bastien Montagne
Mostly pass bmain and do not check for NULL key, keys' make_local is suspiciously simple in fact, but think until those behave like real full-featured IDs, it's doing enough!
2016-07-09Minor fix/cleanup to object's make_local.Bastien Montagne
2016-07-09Clear Transforms and DeltasJoshua Leung
* Alt-G, Alt-R, Alt-S --> These don't clear delta transforms by default anymore, making it possible to use these to properly store a "rest" pose * Alt-Shift-G, Alt-Shift-R, Alt-Shift-S --> These WILL clear both the normal transform and the delta, should you need to do so.
2016-07-08Fix (unreported) broken shapekeys after 'make_local' of datablocks used both ↵Bastien Montagne
directly and directly. At first thought it was own recent work, but think issue is there since ages actually... Basically, id_make_local() would always localize mesh/curve/lattice shapekeys, even in case obdata localization actually made a local copy instead of localizing original datablock. This was causing shapekeys being localized twice, and other odd nasty effects.
2016-07-08Initial fix for proxy issues regarding new libquery/libremap ID handling code.Bastien Montagne
libquery now passes an extra flag info to the callback, in case that specific ID usage is considered as indirect. In most cases, it's just set from ID_IS_LINKED_DATABLOCK() result on datablock owner, but in proxy object case we also consider ob->data, materials and pose usages as indirect. Does not fixes all issues yet, but should already make behavior with proxy object saner.
2016-07-08Refactor/enhance BKE_mesh_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Provides same kind of fixes/improvements as for BKE_object_make_local() (see rBd1a4ae3f395a6). Note: this enlightened broken case of proxy objects regarding make_local (and also whole remapping, in fact). Will be fixed in near future.
2016-07-08Fix own very stupid mistake in BKE_library_idtype_can_use_idtype() usage ↵Bastien Montagne
(inverted arguments).
2016-07-08Libquery: fix missing image pointers from Mesh's UV layers.Bastien Montagne
Not really happy with this, could lead to a **lot** of callback executions... But libquery foreach looper must go over **all** ID pointers, otherwise remapping & co is broken! A possible fix for future would be to have 'image slots' defined at root of poly/facetex layers, and just a (short) index in each face/poly item - would also save a reasonable amount of memory...
2016-07-08Refactor/enhance BKE_object_make_local().Bastien Montagne
Now using modern features from libquery/libremap areas. Also, it should handle much better cases where localized ID was also indirectly used by non-refcounting users (typical case: object used as modifier/constraint/whatever target from another linked object, previous code would not take those into account and just localize original object instead of making a local copy. Would result in local object used by linked one, which would be partially 'undone' on next file reload... Crappy behavior). And it fixes some obvious errors too (nullifying all proxy pointers unconditionnaly, some missing refcounted usages cases in extern_local_object(), etc.).
2016-07-08Refactor: pass Main to id_make_local.Bastien Montagne
Totally stupid to not pass it, and then let (some) BKE_foo_make_local() use G.main! Note: unused for now, much more refactoring still to come in make_local area!