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-04-05Merge branch 'master' into blender2.8Sybren A. Stüvel
2018-04-05Write the scene render frame range to image/video filesSybren A. Stüvel
This is useful to create a mapping from the frame range in the video to frame index in the blend file. Part of: https://developer.blender.org/D2273 Reviewed by: @campbellbarton
2018-04-01Merge branch 'master' into blender2.8Campbell Barton
- Undo that changes modes currently asserts, since undo is now screen data. Most likely we will change how object mode and workspaces work since it's not practical/maintainable at the moment. - Removed view_layer from particle settings (wasn't needed and complicated undo).
2018-03-10Merge branch 'master' into blender2.8Brecht Van Lommel
2018-03-10Cycles: add roughness baking support, using squared roughness convention.Brecht Van Lommel
2018-02-14Object Mode: remove Scene.obeditCampbell Barton
This means we can support having the same scene in different windows with different edit-objects.
2018-02-13Object Mode: remove Scene.obeditCampbell Barton
Add ED_screen_window_find, BKE_workspace_edit_object
2018-02-13Object Mode: pass edit-object to outliner drawingCampbell Barton
Also add 'OBEDIT_FROM_EVAL_CTX' macro.
2018-01-19Merge branch 'master' into blender2.8Campbell Barton
2018-01-18Fix T53808: VSE doesn't show scene strip markersCampbell Barton
2018-01-18Merge branch 'master' into blender2.8Campbell Barton
2018-01-18Fix weight particle brush versioningCampbell Barton
2018-01-18Cleanup: label scene flags more clearlyCampbell Barton
Also correct typo in enum name
2018-01-15Merge branch 'master' into blender2.8Sergey Sharybin
2018-01-15Sculpting: Sdd an option to hide mask in viewportSergey Sharybin
Brushes themselves are still affected by the mask, but the viewport is not showing the mask. This way it's easier to see details while sculpting. Studio request by Julien Kaspar
2017-12-15Merge branch 'master' into blender2.8Sergey Sharybin
2017-12-14DNA: Add dedicated recalc flag to IDSergey Sharybin
Currently unused, but this is where LIB_TAG_ID_RECALC* flags will go. Also modified other DNA to make pointer property being followed by pointer. Makes it easier to keep track of alignment and extend nested structures without ruining anything.
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-23Cleanup: Rename ViewLayer *sl > ViewLayer *view_layerDalai Felinto
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-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-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-09Farewell BaseLegacyDalai Felinto
Finally, bases are all using the latest, newest SceneLayer bases.
2017-11-09Rename Scene macros back to their original _NEW less namesDalai Felinto
2017-11-09Farewell Scene->basactDalai Felinto
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-10-20Depsgraph: Introduce hash of dependency graphs in the scene levelSergey Sharybin
The idea is following: we do need to have multiple dependency graphs to denote different scene layers (depsgraph should only contain objects from a specific scene layer), and we also want to support same scene layer to be evaluated to a different state in different windows. In order to achieve that we do need to have a list or hash (for faster lookup presumably) somewhere. To keep things easier for now, it will be a scene which owns that hash. This seems to make sense anyway, since dependency graph only points to data which is owned by scene. This commit only introduces some basic API and hash itself stored in DNA, there is no changes in behavior. See this as a first step towards getting rid of scene-global dependency graph.
2017-10-20Remove unused dependency graph flags from sceneSergey Sharybin
2017-10-20Remove some residue of old legacy dependency graphSergey Sharybin
2017-10-17Merge branch 'master' into blender2.8Campbell Barton
2017-10-17Cleanup: use 'e' prefix for enum typedefsCampbell Barton
Convention was only followed loosely, apply to DNA where changes aren't likely to conflict. (Skipped ModifierType for eg).
2017-10-16Workspace: Move engines to workspace and Properties Editor cleanupDalai Felinto
Engine is not stored in WorkSpaces. That defines the "context" engine, which is used for the entire UI. The engine used for the poll of nodes (add node menu, new nodes when "Use Nodes") is obtained from context. Introduce a ViewRender struct for viewport settings that are defined for workspaces and scene. This struct will be populated with the hand-picked settings that can be defined per workspace as per the 2.8 design. * use_scene_settings * properties editor: workshop + organize context path Use Scene Settings ================== For viewport drawing, Workspaces have an option to use the Scene render settings (F12) instead of the viewport settings. This way users can quickly preview the final render settings, engine and View Layer. This will affect all the editors in that workspace, and it will be clearly indicated in the top-bar. Properties Editor: Add Workspace and organize context path ========================================================== We now have the properties of: Scene, Scene > Layer, Scene > World, Workspace [Scene | Workspace] > Render Layer > Object [Scene | Workspace] > Render Layer > Object > Data (...) Reviewers: Campbell Barton, Julian Eisel Differential Revision: https://developer.blender.org/D2842
2017-10-06Merge branch 'master' into blender28Campbell Barton
2017-10-06Vertex Paint: move normal falloff into the brushCampbell Barton
All related settings are already in the brush, so it's inconvenient to switch panels to change this one option.
2017-10-06Vertex Paint: use brush front-face settingCampbell Barton
Follow sculpt mode more closely by using the brush front-face option.
2017-10-05Sculpt Mode: 2D falloff optionCampbell Barton
This makes brush influence into a tube instead of a sphere. It can be used along the outline of a mesh to adjust it's silhouette. Note that all this takes advantage of changes from vertex paint, from testing this seems useful so exposing from the brush options.
2017-10-04Merge branch 'master' into blender2.8Sergey Sharybin
2017-10-03Vertex Paint: remove accumulate (soc-2017-vertex_paint)Campbell Barton
This secondary accumulation option accumulated brush falloff. The same option in image painting accumulates color as vertex paiht 'Spray' does. Giving this option different behavior for vertex paint seems strange. Also this is basically increasing falloff over time. Remove the new code, expose existing 'Spray' as 'Accumulate' to match other paint modes.
2017-10-03Merge branch 'master' into blender2.8Sergey Sharybin
Notes: - Changes in paint_vertex.c were simple to merge, mainly related on passing evaluation context. - Conflicts in EditDM and drawmesh.c are solved using code from blender2.8 branch. Those areas are deprecated and not to be used in final release. However, it's possible that some reference code from master is lost, so keep attention when adding alpha support for vertex painting.
2017-10-02Vertex Paint: projection optionsCampbell Barton
This makes vertex paint match image painting more closely. - Add falloff shape option sphere/circle where sphere uses a 3D radius around the cursor and circle uses a 2D radius (projected), like previous releases. - Add normal angle option so you can control the falloff. - Add Cull option, to paint onto faces pointing away. Disabling normals, culling and using circle falloff allows you to paint through the mesh.
2017-09-27Merge branch 'master' into blender2.8Campbell Barton
2017-09-27Vertex/Weight Paint: Use PBVH for paintingCampbell Barton
2016 GSOC project by @nathanvollmer, see D2150 - Mirrored painting and radial symmetry, like in sculpt mode. - Volume based splash prevention, which avoids painting vertices far away from the 3D brush location. - Normal based splash prevention, which avoids painting vertices with normals opposite the normal at the 3D brush location. - Blur mode now uses a nearest neighbor average. - Average mode, which averages the color/weight of the vertices within the brush - Smudge mode, which pulls the colors/weights along the direction of the brush - RGB^2 color blending, which gives a more accurate blend between two colors - multithreading support. (PBVH leaves are painted in parallel.) - Foreground/background color picker in vertex paint
2017-09-26Merge branch 'master' into blender2.8Campbell Barton