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
2017-12-05Merge branch 'master' into blender2.8Germano
# Conflicts: # source/blender/editors/mesh/editmesh_select.c
2017-12-05Version patching fixes for F-Curves (as required for fixes for T48988 and ↵Joshua Leung
T52009) * For the T48988 fix (i.e. separate Ease In/Out properties for Bendy Bones in Edit vs Pose modes), old animation data needed to be patched to use the new property names. This is needed to partially fix some of the issues in T53356 (though the Rigify code itself still needs to be patched). * For the T52009 fix, old files needed to have the frame_start and frame_end properties on the FModifier (base-class) updated to match that of the FMod_Stepped type-specific class. This wasn't done in the earlier commit since it wasn't worth going through all animation data just for the sake of updating these relatively-rare settings, but since we're doing it anyway now, it makes sense to include this here.
2017-12-04Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c source/blender/windowmanager/intern/wm_files_link.c
2017-12-04Cleanup: link/append: get rid of booleans in func parameters.Bastien Montagne
One or two are OK, but more make it rather unreadable, and future work is likely to require more toggle specific behavior here. So switched to bitflags, switching from short to int and using 16 upper bits for 'internal' ones defined in BLO_readfile.h, combined with 'public' ones from user interaction, defined in DNA_space_types.h
2017-12-04WM: message bus replacement for property notifiersCampbell Barton
Use dynamically generated message publish/subscribe so buttons and manipulators update properly. This resolves common glitches where manipulators weren't updating as well as the UI when add-ons exposed properties which hard coded listeners weren't checking for. Python can also publish/scribe changes via `bpy.msgbus`. See D2917
2017-12-04Eevee: Irradiance Visibility: Add RNA / Engine propertiesClément Foucault
2017-12-04Cleanup: whitespaceCampbell Barton
2017-12-02Cleanup: minor change to API useCampbell Barton
2017-12-02Cleanup: indentationCampbell Barton
2017-12-01Fixup for workspace view_layer fixDalai Felinto
We do not assume subversion bump until we actually change the subversion. For example, a branch may have bumped its subversion to 3, yet still require the new doversion code introduced on 108c4bd5026.
2017-12-01Fix crash reading 2.8 files with workspace.view_layer setJulian Eisel
Stupid error from e8c15e0ed15f8369d. Also removed WorkSpace.view_layer usage and marked as deprecated.
2017-12-01Groups and collection: initial integrationDalai Felinto
Since we are ditching layers from Blender (2.8) we need a replacement to control groups visibility. This commit introduces collections as the building blocks for groups, allowing users to control visibility as well as overrides for groups. Features ======== * Groups now have collections This way you can change the visibility of a collection inside a group, and add overrides which are part of the group and are prioritized over other overrides. * Outliner Groups can inspect their collections, change visibility, and add/remove members. To change an override of a group collection, you need to select an instance of the group, and then you can choose "group" in the collection properties editor to edit this group active collection instead of the view layer one. * Dupli groups overrides We can now have multiple instances of the same group with an original "override" and different overrides depending on the collection the instanced object is part of. Technical ========= * Layers We use the same api for groups and scene as much as possible. Reviewers: sergey (depsgraph), mont29 (read/write and user count) Differential Revision: https://developer.blender.org/D2892
2017-12-01Workspaces: Store an active view-layer per sceneJulian Eisel
Instead of storing a single active view-layer in the workspace, one is stored for each scene the workspace showed before. With this, some things become possible: * Multiple windows in the same workspace but showing different scenes. * Toggling back and forth scene keeps same active view-layer for each scene. * Activating workspace which didn't show current scene before, the current view-layer is kept. A necessary evil for this is that accessing view-layer and object mode from .py can't be done via workspace directly anymore. It has to be done through the window, so RNA can use the correct scene. So instead of `workspace.view_layer`, it's `window.view_layer` now (same with mode) even though it's still workspace data. Fixes T53432.
2017-12-01Depsgraph: Remove clear of legacy unused flagSergey Sharybin
2017-12-01Depsgraph: Don't use legacy flags in versioning codeSergey Sharybin
Wondering whether files from 2.37 are still working fine. Don't have that version of Blender running here, so can't test :(
2017-11-29Merge branch 'master' into blender2.8Brecht Van Lommel
2017-11-29Sequencer: add many more color blend modes, and a new color mix strip.Maikon Araujo
Differential Revision: https://developer.blender.org/D2872
2017-11-29Merge ID static override, part I: core changes in DNA, BKE and .blend ↵Bastien Montagne
read/write. See https://developer.blender.org/D2417 for details. Note that since static overrides rely heavily on RNA, this commit is essentially invisible from user PoV, more in next commits.
2017-11-27Merge branch 'master' into blender2.8Sergey Sharybin
2017-11-27Sequencer: Add option to render OpenGL preview with DoFSergey Sharybin
The title says it all actually, controlled with DoF check box next to textured solid check box. Thanks Campbell for review!
2017-11-23Rename any instance of scene layer or render layer in code with view layerDalai Felinto
The RenderResult struct still has a listbase of RenderLayer, but that's ok since this is strictly for rendering. * Subversion bump (to 2.80.2) * DNA low level doversion (renames) - only for .blend created since 2.80 started Note: We can't use DNA_struct_elem_find or get file version in init_structDNA, so we are manually iterating over the array of the SDNA elements instead. Note 2: This doversion change with renames can be reverted in a few months. But so far it's required for 2.8 files created between October 2016 and now. Reviewers: campbellbarton, sergey Differential Revision: https://developer.blender.org/D2927
2017-11-22Fix doversion crash with 2.8 files that had freestyle 2.8Dalai Felinto
Crash introduced on: 3a95bdfc65d883e7db006fd We can't decrease user count of freestyle linestyle IDs before linking. Moving doversion for after linking. And for the records we are simply removing the freestyle data altogether. This is only for files created with 2.8, so it should be fine.
2017-11-22Fixup for last commit: flipped logic for disabling SceneLayer renderDalai Felinto
2017-11-22Layers doversion: Don't set the Viewport created layer as renderableDalai Felinto
2017-11-22Fix SceneRenderLayer memory leak for files created with 2.8Dalai Felinto
2017-11-22SceneRenderLayer Removal/RefactorDalai Felinto
This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
2017-11-22SceneRenderLayer > SceneLayer: Convert LayDalai Felinto
There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit.
2017-11-22Doversion: We should always add the old RenderLayerDalai Felinto
We cannot assume a render layer does not have a setting that was needed for compositing. Even if: ``` (scene->lay & render_layer->lay) != (scene_lay) && (render_layer->lay | render_layer->lay_exclude) == 0)) ``` Which would mean use the scene layers just as they are.
2017-11-22Bitflag tests simplificationDalai Felinto
2017-11-22SceneRenderLayer > SceneLayer: Convert Z-MaskDalai Felinto
Note: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher).
2017-11-22SceneRenderLayer > SceneLayer: Convert samples_overrideDalai Felinto
Note: Cycles still need to handle its own doversion for theses cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED.
2017-11-22SceneRenderLayer > SceneLayer: Convert material_overrideDalai Felinto
2017-11-22SceneRenderLayer > SceneLayer: Remove light_overrideDalai Felinto
2017-11-22SceneRenderLayer > SceneLayer: Remove exclude_layerDalai Felinto
Note: It is up to Cycles to still get rid of exclude_layer internally: RenderLayerInfo.exclude_layer
2017-11-16Fix T51210: Draw Manager: Support for Metaball DrawingGermano
Differential Revision: D2914
2017-11-14Cleanup: remove BLI_blenlib from ghash headerCampbell Barton
This causes source files to depend on ghash header for BLI_string/rect/listbase. Also quiet warnings.
2017-11-10Fixup for doversion/layers: disable collections for scene layersDalai Felinto
2017-11-10Layers doversion: Handle hide and hide_render objectsDalai Felinto
We now created nested collections for the original Collection 1, 2 ... collections for the "hide" and "hide_render" objects. Also, remove logic for rename single-collection files, it's now kept as it was originally (Collection 1, Collection 5, ...). Thanks Sergey Sharybin and Pablo Vazquez for patch review and suggestions.
2017-11-09Farewell Scene->basactDalai Felinto
2017-11-09Cleanup: Use full name for scene_layer in blenloaderSergey Sharybin
2017-11-09Remove unused screen-name storage in windowJulian Eisel
Checked in really old revisions, seems like this was never used. So doesn't matter for compatibility either (tested opening files saved with this in 2.49).
2017-11-08Farewell Scene->baseDalai Felinto
While getting rid of Scene->base we got the following fixes: * Fix "Convert To" operator * Fix "NLA allowing to selected objects that are not selectable * Fix scene.objects (readonly, no option to link/unlink) Note: Collada needs to use the context SceneLayer for adding objects however I added a placeholder, so Collada maintainers can fix this properly.
2017-11-08Depsgraph: Remove traces of old single-per-scene dependency graphSergey Sharybin
2017-11-06Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/device/device.cpp source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/material.c source/blender/editors/object/object_add.c source/blender/editors/object/object_relations.c source/blender/editors/space_outliner/outliner_draw.c source/blender/editors/space_outliner/outliner_edit.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/util/ed_util.c source/blender/windowmanager/intern/wm_files_link.c
2017-11-05Merge branch 'master' into blender2.8Campbell Barton
2017-11-05Cleanup: spellingCampbell Barton
2017-11-01Eevee: Fix Exponent default in versioning codeClément Foucault
2017-10-26Move background images into the cameraCampbell Barton
This moves background images out of the 3D viewport, to be used only as camera reference images. For 3D viewport references, background images can be used, see: D2827 Some work is still needed (background option isn't working at the moment).
2017-10-24Fix non-instanced groups in no-collection file creating collectionsDalai Felinto
This is a corner-case, but one that is too easy to reproduce: * Unlink all the collections of active view layer. * Link a group without "Instancing" it.
2017-10-24Fix T53141: Assert when using transformation in new 3D View editorJulian Eisel
Was actually possible to invoke this assert failure in two ways: * Transforming in newly created 3D View (like described in the report). * Transforming in newly appended workspace from default workspaces.blend. Issue was that default workspaces.blend was saved in 2.8.1, but in a branch state that didn't include the transform-orientation changes. So versioning code wouldn't run when needed. Note that files saved with this bug will still cause the assert to fail. Can be ignored then. This is not related to manipulators (as suggested in the report).