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
2018-08-12Merge branch 'hair_guides' into hair_guides_groominghair_guides_groomingLukas Tönne
2018-08-03New grease pencil primitive STROKEAntonioya
This creates a simple stroke with several colors to have a basic structure to start drawing.
2018-07-31Respect ID user count when creating pose on object copySergey Sharybin
This solves wrong user counter of custom shape when duplicating bone few times and then undoing all the duplications.
2018-07-31New Grease Pencil object for 2D animationAntonioya
This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-20Fix T55973: [2.8] Crash when 'apply pose as rest pose' when bone scale is 0,0,0.Bastien Montagne
`BKE_pose_rebuild()` should (ideally) always trigger a rebuild of the depsgraph, since it can add or remove posechannels. This function now takes a Main parameter to ensure that related depsgraphes are tagged as dirty (kept it optional, for some corner cases). We should also probably double-check calls to that function, think in theory it should only be called from depsgraph itself? But for now...
2018-07-15Merge branch 'hair_guides' into hair_guides_groomingLukas Toenne
2018-07-06UI/Python: rename Lamps to Lights, to follow more standard terminology.Brecht Van Lommel
Internally it's still mostly named lamps, though some modules like Cycles were already calling them lights.
2018-07-03Merge branch 'hair_guides' into hair_guides_groomingLukas Tönne
2018-07-02Merge branch 'master' into blender2.8Campbell Barton
2018-07-02Cleanup: use bool for poll functionsCampbell Barton
2018-07-01RNA: use bool for boolean RNA typesCampbell Barton
We were using int's for bool arguments in BKE, just to avoid having wrapper functions.
2018-06-29Refactor static override code to pass Main around.Bastien Montagne
Access to main database is actually rarely needed, but some custom 'apply' functions do need it (like Collections' overriding of objects or children collections).
2018-06-28Static Override: RNA apply code: pass extra 'item_ptr' to apply callbacks.Bastien Montagne
This is unused currently, but is mandatory for incomming support to Collections objects and children items override support.
2018-06-27Merge branch 'hair_guides' into hair_guides_groomingLukas Tönne
2018-06-25Cleanup: rename object base flags to be more clear.Brecht Van Lommel
2018-06-22Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/makesrna/intern/rna_image.c source/blender/makesrna/intern/rna_object.c source/blender/makesrna/intern/rna_object_force.c source/blender/makesrna/intern/rna_screen.c source/blender/makesrna/intern/rna_sculpt_paint.c source/blender/makesrna/intern/rna_space.c source/blender/python/bmesh/bmesh_py_types.c source/blender/python/generic/bpy_internal_import.h source/blender/python/intern/bpy_rna_anim.c source/blender/python/intern/gpu_offscreen.c
2018-06-22Cleanup: remove last G.main from RNA.Bastien Montagne
Again, we cannot actually get rid of G_MAIN global access here, so in most case just 'marked' them as valid, and added assert checks to ensure we do only work with IDs in G_MAIN in those cases.
2018-06-21Merge branch 'hair_guides' into hair_guides_groomingLukas Tönne
2018-06-20Depsgraph: add some missing depsgraph tags when relations change.Brecht Van Lommel
2018-06-20Objects: restore per object restrict view/render/select.Brecht Van Lommel
Note this is now separate from H key hiding, and meant for more persistent ways to define which objects are relevant to the viewport or render. This avoids some cases where you'd have to create collection specifically to hide objects for viewport/render.
2018-06-15Merge branch 'hair_guides' into hair_guides_groomingLukas Tönne
2018-06-13Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/readfile.c source/blender/editors/mesh/editmesh_utils.c source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-13Cleanup: get rid of last G.main in BMesh code.Bastien Montagne
2018-06-13Cleanup: moar ugly G.main removal...Bastien Montagne
Note that due to RNA get/setters issue, that one may actually add some G.main usages to the total... But at least it's not hidden anymore in a very low-level, dark corner of BKE pointcache code!
2018-06-11Improve/partially fix overriding of Object material pointers.Bastien Montagne
Basic workflow shall now work, still lots to do in the UI (ID template needs some love to reflect overriden status ;) ).
2018-06-11Cleanup: remove object.is_visible.Brecht Van Lommel
Depsgraph already iterates over visible objects, and since this was only valid for objects evaluated with the depsgraph it was confusing.
2018-06-09Merge branch 'master' into blender2.8Campbell Barton
2018-06-09Cleanup: trailing space in RNACampbell Barton
2018-06-09RNA: revert object mode re-orderCampbell Barton
This was done so numbered shortcuts made sense. Now order matches master.
2018-06-09Merge branch 'hair_guides' into hair_guides_groomingLukas Tönne
2018-06-07Cleanup: Nuke moar G.main usages...Bastien Montagne
2018-06-06Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/collada/ArmatureExporter.cpp source/blender/collada/ArmatureExporter.h source/blender/collada/DocumentExporter.cpp source/blender/collada/DocumentExporter.h source/blender/collada/SceneExporter.cpp source/blender/collada/SceneExporter.h source/blender/collada/collada.cpp source/blender/collada/collada.h source/blender/editors/armature/armature_edit.c source/blender/editors/armature/editarmature_retarget.c source/blender/editors/armature/pose_transform.c source/blender/editors/include/ED_armature.h source/blender/editors/include/ED_object.h source/blender/editors/include/ED_screen.h source/blender/editors/io/io_collada.c source/blender/editors/object/object_transform.c source/blender/editors/screen/screen_edit.c source/blender/editors/screen/screen_ops.c source/blender/windowmanager/intern/wm.c source/blender/windowmanager/intern/wm_files.c source/blender/windowmanager/intern/wm_window.c source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-06Cleanup: Nuke moar G.main usages...Bastien Montagne
2018-06-05Merge branch 'hair_guides' into hair_guides_groomingLukas Tönne
2018-06-05Static Override: Fix order of operations issue in material slots.Bastien Montagne
*Really* not happy with that kind of constraint, but no choice for now...
2018-06-05Static Override: progresses towards full support for material slots.Bastien Montagne
Material slots are a real pain to get working, due to all the black magic they do to hide object vs. obdata storage of the material... Currently hitting an order problem - we need to always set 'link' (to object or obdata) property of the slot first, before we set its material... *super-sigh*
2018-06-05Fix stupid mistake in previous commit.Bastien Montagne
2018-06-05RNA/Override: Move override-related property flags to own variable.Bastien Montagne
We are already running out of available flags in main, generic int, and everytime I work on static override I find new special cases that will need new specific propflag, so...
2018-06-05Baby step towards making overridable materials for objects.Bastien Montagne
Naughty Collections RNACollection of objects is still to be tamed, but for individual objects should work now....
2018-06-01UI: use same "Viewport Display" name for scene/object/material panels.Brecht Van Lommel
2018-05-31Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/BKE_camera.h source/blender/blenkernel/BKE_dynamicpaint.h source/blender/blenkernel/BKE_object.h source/blender/blenkernel/intern/camera.c source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/smoke.c source/blender/editors/object/object_transform.c source/blender/editors/physics/dynamicpaint_ops.c source/blender/editors/space_view3d/view3d_edit.c source/blender/editors/space_view3d/view3d_view.c source/blender/modifiers/intern/MOD_dynamicpaint.c source/blenderplayer/bad_level_call_stubs/stubs.c
2018-05-31Cleanup: remove G.main from BKE objectBastien Montagne
Had to add some G.main to modifiers, but in 2.8 we do not need that anymore, so it's not that bad! ;)
2018-05-30Depsgraph API: renaming, more granular update information.Brecht Van Lommel
* depsgraph.ids: all evaluated datablocks in the depsgraph * depsgraph.objects: all evaluated objects in the depsgraph * depsgraph.object_instances: all object instances to display or render * depsgraph.updates: list of updates to datablocks
2018-05-30Keymap: group paint modes, reorder enumCampbell Barton
Menu now matches the keymap.
2018-05-29Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/BKE_material.h source/blender/blenkernel/BKE_mesh.h source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/material.c source/blender/editors/object/object_relations.c source/blender/editors/render/render_preview.c source/blender/makesrna/intern/rna_object.c
2018-05-29Cleanup: Get rid of G.main in BKE_material.Bastien Montagne
Note that in some cases, this only moves the G.main case to somne other places - in particular, RNA getters/setters are becoming annoying here...
2018-05-21Revert "Cleanup: Temporarily removed all groom object type code, move it to ↵Lukas Tönne
a separate branch." This reverts commit b5fa901697ffe62287eae5186c0f29d118364897.
2018-05-21Cleanup: Temporarily removed all groom object type code, move it to a ↵Lukas Tönne
separate branch.
2018-05-21Merge branch 'blender2.8' into hair_guidesLukas Tönne
2018-05-18Collections and groups unificationBrecht Van Lommel
OVERVIEW * In 2.7 terminology, all layers and groups are now collection datablocks. * These collections are nestable, linkable, instanceable, overrideable, .. which opens up new ways to set up scenes and link + override data. * Viewport/render visibility and selectability are now a part of the collection and shared across all view layers and linkable. * View layers define which subset of the scene collection hierarchy is excluded for each. For many workflows one view layer can be used, these are more of an advanced feature now. OUTLINER * The outliner now has a "View Layer" display mode instead of "Collections", which can display the collections and/or objects in the view layer. * In this display mode, collections can be excluded with the right click menu. These will then be greyed out and their objects will be excluded. * To view collections not linked to any scene, the "Blender File" display mode can be used, with the new filtering option to just see Colleciton datablocks. * The outliner right click menus for collections and objects were reorganized. * Drag and drop still needs to be improved. Like before, dragging the icon or text gives different results, we'll unify this later. LINKING AND OVERRIDES * Collections can now be linked into the scene without creating an instance, with the link/append operator or from the collections view in the outliner. * Collections can get static overrides with the right click menu in the outliner, but this is rather unreliable and not clearly communicated at the moment. * We still need to improve the make override operator to turn collection instances into collections with overrides directly in the scene. PERFORMANCE * We tried to make performance not worse than before and improve it in some cases. The main thing that's still a bit slower is multiple scenes, we have to change the layer syncing to only updated affected scenes. * Collections keep a list of their parent collections for faster incremental updates in syncing and caching. * View layer bases are now in a object -> base hash to avoid quadratic time lookups internally and in API functions like visible_get(). VERSIONING * Compatibility with 2.7 files should be improved due to the new visibility controls. Of course users may not want to set up their scenes differently now to avoid having separate layers and groups. * Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero files. There's a few things which are know to be not quite compatible, like nested layer collections inside groups. * The versioning code for 2.8 files is quite complicated, and isolated behind #ifdef so it can be removed at the end of the release cycle. KNOWN ISSUES * The G-key group operators in the 3D viewport were left mostly as is, they need to be modified still to fit better. * Same for the groups panel in the object properties. This needs to be updated still, or perhaps replaced by something better. * Collections must all have a unique name. Less restrictive namespacing is to be done later, we'll have to see how important this is as all objects within the collections must also have a unique name anyway. * Full scene copy and delete scene are exactly doing the right thing yet. Differential Revision: https://developer.blender.org/D3383 https://code.blender.org/2018/05/collections-and-groups/