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-05-18Remove "Modern Viewport"Dalai Felinto
The "Modern Viewport" was an option in the Viewport panel that would use the new fancy wire frame code and some depth debugging functionality. This was introduced as a quick and dirty way to get the new drawing system showing in the viewport. Overtime we built a complete Draw Manager system, leaving this original approach deprecated which adds clutter to Blender code since it would be removed sooner or later. Note: The new fancy wireframes and related shaders (white out other objects) are still in Blender code, though you can't use them anymore. If we are to have any of those drawing options they should be integrated in the new draw manager, instead of integrated in the old drawing pipeline as it was originally coded.
2017-05-04Draw Manager: Implement render info for external enginesDalai Felinto
This can be used by any engine actually. For example to give feedback regarding probe caching in Eevee, .... Unline master, we try to conciliate both the original viewport info (FPS, view name) and the render info. Note: I had to split the function in two because the camera alpha passepartout is handled inside the view3d_draw_region_info function. Review: Campbell Barton and Clement Foucault. Thanks to Sergey Sharybin and Pablo Vazquez for some of the design discussions.
2017-05-03Cleanup: move off-screen drawing to view3d_draw.cCampbell Barton
Since offscreen drawing now uses draw engine, this doesn't need to be considered legacy. Note that there are some calls into view3d_draw_legacy.c from view3d_draw.c this is generally not accepted, so its only dont where there are checks for new/old engine. Functions exposed to do this use a VP_deprecated prefix.
2017-05-02Cleanup: use depsgraph for scene/layer accessCampbell Barton
2017-04-27Merge branch 'master' into blender2.8Campbell Barton
2017-04-27Cleanup: remove unused matrix argCampbell Barton
2017-04-26Pass graph to depth functionsCampbell Barton
2017-04-26View3D: move depth drawing into own functionCampbell Barton
No functional changes
2017-04-19Remove local view toggle operatorLuca Rood
2017-04-073D View: manipulator from custom-manipulators branchCampbell Barton
Original code from @Severin with changes from @dfelinto & @hypersomniac. This doesn't cause many functional changes besides using new transform manipulators. Submitted as D2604
2017-03-21OpenGL: remove 'circ' helper functionMike Erwin
This was no longer being used. Part of T49043
2017-03-11OpenGL: Convert drawobject.c (cont)Clément Foucault
All remaining 28 deprecated calls are derivedMesh related.
2017-03-09Merge branch 'master' into blender2.8Campbell Barton
Manually merged viewport xray changes
2017-03-093D View: x-ray support for depth pickingCampbell Barton
Selection loop would draw the selection ignoring xray. Now draw in a separate pass after clearing the depth buffer, as with regular drawing. Also disable depth sorting, caller can sort the hit-list by depth if needed.
2017-03-09Merge branch 'master' into blender2.8Campbell Barton
2017-03-08OpenGL Select: integer rect for passing regionCampbell Barton
2017-03-06OpenGL: Object bound drawing.Clément Foucault
2017-03-02Remove all instances of OBACT from drawobject.c and related changesDalai Felinto
2017-03-02Remove tons of OBACTDalai Felinto
There are now only referenced in: * drawobject.c * particle_edit.c * space_image.c (a single case to be handled on workspace branch) * rigidbody_constraint.c (to be handled in the following commit)
2017-02-15Viewport: Ported info drawing to from legacy code.Clément Foucault
2017-02-14OpenGL immediate mode: drawarmature.c (end)Clément Foucault
No deprecated call left.
2017-02-09More housecleaning (BASACT > BASACT_NEW)Dalai Felinto
2017-02-08Bring back Lasso and Circle selection backDalai Felinto
(and replace more instances of BaseLegacy/scene->base with Base/sl->object_bases) Still need mouse selection, box selection, and menu selection Also, there is still a problem with BA_WAS_SEL, at the moment only the objects centers are highlighted.
2017-02-07Clay-Engine (merge clay-engine)Clément Foucault
Initial work by Clément Foucault with contributions from Dalai Felinto (mainly per-collection engine settings logic, and depsgraph iterator placeholder). This makes Blender require OpenGL 3.3. Which means Intel graphic card and OSX will break. Disable CLAY_ENGINE in CMake in those cases. This is a prototype render engine intended to help the design of real render engines. This is mainly an engine with enphasis in matcap and ambient occlusion. Implemented Features -------------------- * Clay Render Engine, following the new API, to be used as reference for future engines * A more complete Matcap customization with more options * Per-Collection render engine settings * New Ground Truth AO - not enabled Missing Features ---------------- * Finish object edit mode - Fix shaders to use new matrix - Fix artifacts when edge does off screen - Fix depth issue - Selection sillhouette - Mesh wires - Use mesh normals (for higher quality matcap) - Non-Mesh objects drawing - Widget drawing - Performance issues * Finish mesh edit mode - Derived-Mesh-less edit mode API (mesh_rende.c) * General edit mode - Per-collection edit mode settings * General engines - Per-collection engine settings (they are their, but they still need to be flushed by depsgraph, and used by the drawing code)
2017-02-07Render Layers and Collections (merge from render-layers)Dalai Felinto
Design Documents ---------------- * https://wiki.blender.org/index.php/Dev:2.8/Source/Layers * https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised User Commit Log --------------- * New Layer and Collection system to replace render layers and viewport layers. * A layer is a set of collections of objects (and their drawing options) required for specific tasks. * A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers. * All Scenes have a master collection that all other collections are children of. * New collection "context" tab (in Properties Editor) * New temporary viewport "collections" panel to control per-collection visibility Missing User Features --------------------- * Collection "Filter" Option to add objects based on their names * Collection Manager operators The existing buttons are placeholders * Collection Manager drawing The editor main region is empty * Collection Override * Per-Collection engine settings This will come as a separate commit, as part of the clay-engine branch Dev Commit Log -------------- * New DNA file (DNA_layer_types.h) with the new structs We are replacing Base by a new extended Base while keeping it backward compatible with some legacy settings (i.e., lay, flag_legacy). Renamed all Base to BaseLegacy to make it clear the areas of code that still need to be converted Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp * Unittesting for main syncronization requirements - read, write, add/copy/remove objects, copy scene, collection link/unlinking, context) * New Editor: Collection Manager Based on patch by Julian Eisel This is extracted from the layer-manager branch. With the following changes: - Renamed references of layer manager to collections manager - I doesn't include the editors/space_collections/ draw and util files - The drawing code itself will be implemented separately by Julian * Base / Object: A little note about them. Original Blender code would try to keep them in sync through the code, juggling flags back and forth. This will now be handled by Depsgraph, keeping Object and Bases more separated throughout the non-rendering code. Scene.base is being cleared in doversion, and the old viewport drawing code was poorly converted to use the new bases while the new viewport code doesn't get merged and replace the old one. Python API Changes ------------------ ``` - scene.layers + # no longer exists - scene.objects + scene.scene_layers.active.objects - scene.objects.active + scene.render_layers.active.objects.active - bpy.context.scene.objects.link() + bpy.context.scene_collection.objects.link() - bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None) + bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None) - bpy.context.object.select + bpy.context.object.select = True + bpy.context.object.select = False + bpy.context.object.select_get() + bpy.context.object.select_set(action='SELECT') + bpy.context.object.select_set(action='DESELECT') -AddObjectHelper.layers + # no longer exists ```
2016-12-28Revert particle system and point cache removal in blender2.8 branch.Lukas Tönne
This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-053D cursor & mini axis for modern viewportMike Erwin
Shuffle existing code, hook it up to the new (& old) viewport. Also the 3D mouse rotation guide for NEW viewport only. Minor feature not worth enabling for legacy 3D view.
2016-11-02Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-30Viewport smoke: add support to render the volume using a color ramp.Kévin Dietrich
This is yet another debug option that allows to render an arbitrary simulation field by using a color ramp to inspect its voxel values. Note that when using this, fire rendering is turned off. Reviewers: plasmasolutions, gottfried Differential Revision: https://developer.blender.org/D1733
2016-10-24Viewport: move the background to the "modern" viewportDalai Felinto
This also leaves room for the gradient background Mike Erwin wants to implement.
2016-10-21Viewport: Bring camera, speaker, rigid body shape and bounding boxDalai Felinto
2016-10-19OpenGL: draw empties with new imm modeMike Erwin
Part of T49043
2016-10-17fix IS_VIEWPORT_LEGACY macroMike Erwin
2016-10-14viewport: draw non-mesh objects for a starterDalai Felinto
This starts to decouple non-mesh objects and the legacy draw pipeline. It shows how we can mix e.g., Cycles and lamps and empties.
2016-10-14viewport: move border drawing code to new fileDalai Felinto
2016-10-14immediate mode: convert render border code and move to new drawingDalai Felinto
routine
2016-10-07Avoid possible compatibility issues with tmp viewport flagsJulian Eisel
We can't prevent users from using this branch, so I'd say it's reasonable to be a bit careful about what we store to files. In this concrete case we were storing a bit-flag for temporary use (only during early viewport transition) in a bit-field that's saved in files. Doing so would mean we either can't reuse this bit later or we risk breaking files (admittedly, likely in a pretty minor way). Moved the bit-flag to a new bit-field which can be removed later.
2016-10-07Viewport: support for external render engines (e.g., Cycles) with depthDalai Felinto
(it is still a rough approach, but you can already see Cycles with Floor (when using board render or full render)
2016-10-06Viewport: bring grid over to the new viewportDalai Felinto
We will keep the old system working as long as we can. At the moment even the visibility flags we are getting from the old system. That will continue like this until we have decided on the new UI
2016-10-05Barebones for viewport code apart from 2.7x drawing codeDalai Felinto
A new option (set in the properties region) allows the user to pick the "new viewport" for the rendering (in the UI: Modern Viewport). For now we have a semi-blank file (view3d_draw.c) that can starts to take over the drawing pipeline. I can't guarantee we will be able to keep both drawing systems working through the entire 2.8 development, but it should do for now. also, we can use branches for some of the viewport development, but it's better to keep things in 2.8 whenever we can, so people can test it.
2016-09-26Merge branch 'master' into blender2.8Bastien Montagne
WARNING! Full build is broken, alembic has not been merged in correctly and has some references to particle stuff. Don't have time to tackle this now (and probably would be better if someone knowing what he's doing does it anyway). Conflicts: release/scripts/startup/bl_ui/properties_particle.py source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/smoke.c source/blender/editors/physics/particle_object.c source/blender/editors/physics/physics_intern.h source/blender/editors/physics/physics_ops.c source/blender/editors/space_outliner/outliner_intern.h source/blender/editors/space_view3d/drawvolume.c source/blender/makesrna/intern/rna_smoke.c
2016-09-24Viewport smoke: add options to draw velocity vectors.Kévin Dietrich
This basically exposes to the UI a function that was only available through a debug macro ; the purpose is obviously to help debugging simulations. It adds ways to draw the vectors either as colored needles or as arrows showing the direction of the vectors. The colors are based on the magnitude of the underlying vectors. Reviewers: plasmasolutions, gottfried Differential Revision: https://developer.blender.org/D1733
2016-08-21Merge branch 'master' into blender2.8Bastien Montagne
In addition to pack of conflicts listed below, also had to comment out particle part of new Alembic code... :/ Conflicts: intern/ghost/intern/GHOST_WindowWin32.cpp source/blender/blenkernel/BKE_effect.h source/blender/blenkernel/BKE_pointcache.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/effect.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/pointcache.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenkernel/intern/smoke.c source/blender/blenkernel/intern/softbody.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/gpu/intern/gpu_debug.c source/blender/makesdna/DNA_object_types.h source/blender/makesrna/intern/rna_particle.c
2016-08-18NDOF: compile 3D mouse code only if WITH_INPUT_NDOFMike Erwin
When WITH_INPUT_NDOF is disabled, 3D mouse handling code is removed from: - GHOST (was mostly done, finished the job) - window manager - various editors - RNA - keymaps The input tab of user prefs does not show 3D mouse settings. Key map editor does not show NDOF mappings. DNA does not change. On my Mac the compiled binary is 42KB smaller after this change. It runs fine WITH_INPUT_NDOF on or off.
2016-08-08OpenGL: simplify 3D cursor drawingMike Erwin
Use simple alternating colored lines instead of stippled overdraw. Reimplement circ function to not use deprecated GLU (T49042). It also leaves matrix stack untouched. Remove unused circf function.
2016-07-18Merge branch 'master' into blender2.8Campbell Barton
2016-07-15Add "Snap Selection to Active" option in menuCampbell Barton
D1963 by @wisaac, re-worked to de-duplicate logic
2016-05-24Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/blender_curves.cpp source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/particle.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/physics/particle_edit.c source/blender/editors/transform/transform_snap_object.c source/blender/editors/util/undo.c source/blender/makesrna/intern/rna_object_force.c
2016-05-22Use previous shading mode for border render in viewportSergey Sharybin
This way we can have border rendered part in the viewport and have everything else material/texture shaded.
2016-05-22Make Shift-Z in viewprot a toggle between current shading mode and rendered oneSergey Sharybin
This way it is now possible to toggle between material and rendered shading while previously rendered viewport will always go back to solid shading.