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-02-12Merge branch 'blender2.8' into transform-manipulatorsJulian Eisel
Conflicts: source/blender/editors/interface/resources.c source/blender/editors/space_view3d/view3d_intern.h source/blender/editors/transform/transform_manipulator.c source/blender/gpu/CMakeLists.txt source/blender/gpu/intern/gpu_shader.c
2017-02-09Layers: set active object in doversion for all render layersDalai Felinto
2017-02-08Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/blenloader/intern/writefile.c
2017-02-07Partial "fix" for objects not being selectedDalai Felinto
To bring this fix a step further we need to address all the BA_WAS_SEL instances, and make sure they follow the new design. This commit allow you to see the object selected (its center anyways) when you do select all. Note: in the clay engine selection (a) was already working fine.
2017-02-07Layers: get/update CollectionEngineSettings (depsgraph placeholder)Dalai Felinto
Every time: * A collection settings is set * A collection visibility changes * An object is added/removed/ ... We need to recalculate the "accumulated" CollectionEngineSettings that the render engine should use for an object. This is to be handled by the depsgraph. Meanwhile this code should allow us to start using those settings in the render engines. Note: We are storing this in the objects, which means we can only have one active calculated option every time. This is intended to get the conversation with the Depsgraph department going.
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 ```
2017-02-06Fix (unreported) Object previews being written even for skipped objects.Bastien Montagne
2017-02-06Cleanup writefile code a bit.Bastien Montagne
Modernize some of it a bit, saves quite some lines of blabla (using shile instead of for loops... tsssts...).
2017-01-31Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/library_query.c
2017-01-31Cleanup: use 'cb_flag', not 'cd_flag' for library_query callbacks.Bastien Montagne
`cd_flag` tends to be used for CustomData flags in mesh area, while for library_query those are rather callback flags...
2017-01-31Cleanup: Rename callback flags from library_query to `IDWALK_CB_...`Bastien Montagne
Better to have clear way to tell whether flag is parameter for BKE_library_foreach_ID_link(), parameter for its callback function, or return value from this callback function.
2017-01-30Merge branch 'blender2.8' into transform-manipulatorsJulian Eisel
2017-01-27Mesh batch caches should not be stored in fileDalai Felinto
2017-01-27Fixup for rBac58a7fa (HSV doversion)Dalai Felinto
We are not bumping file version, but we cannot have the doversion code running twice. In this particular case it was crashing files, since we were setting node->storage to NULL, and later on accessing it.
2017-01-26Blender 2.8: Apparently auto-merge worked incorrect in the merge commitSergey Sharybin
2017-01-26Merge branch 'master' into blender2.8Sergey Sharybin
2017-01-26Compositor: Make HSV node inputs a real socketsSergey Sharybin
This is much more flexible solution which will allow doing some more procedural features. Reviewers: brecht, dfelinto, mont29 Reviewed By: mont29 Subscribers: Severin Differential Revision: https://developer.blender.org/D2403
2017-01-26Fix T50287: Blender crashes when open a blend that contains an alembicKévin Dietrich
file. Missed in rB62a2ed97b.
2017-01-22Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/space_action/action_draw.c
2017-01-20Merge branch 'blender2.8' into transform-manipulatorsJulian Eisel
2017-01-20D1873: Customize style for animation motion pathsAntonio Vazquez
New options to define the style of the animation paths in order to get better visibility in complex scenes. Now is possible define the color, thickness and several options relative to the style of the lines used to draw motion path.
2017-01-18GP Interpolate Sequence: Tool settings for controlling the shape of ↵Joshua Leung
interpolation This commit introduces the ability to use the Robert Penner easing equations or a Custom Curve to control the way that the "Interpolate Sequence" operator interpolates between keyframes. Previously, it was only possible to get linear interpolation between the gp frames. Workflow: 1) Place current frame between a pair of GP keyframes 2) Open the "Interpolate" panel in the Toolshelf 3) Choose the interpolation type (under "Sequence Options") 4) Adjust settings (e.g. if you're using "Custom Curve", use the curvemap widget to define the way that the interpolation proceeds) 5) Click "Sequence" to interpolate 6) Play back/scrub the animation to see if you've got the result you want 7) If you need to make some tweaks, undo, or delete the generated keyframes, then repeat the process again from step 4 until you've got the desired result.
2017-01-16Merge branch 'master' into blender2.8Bastien Montagne
2017-01-16Cleanup/refactor: Add new BLI_string_util.Bastien Montagne
Things like `BLI_uniquename` had nothing, but really nothing to do in BLI_path_util files! Also, got rid of length limitation in `BLI_uniquename_cb`, we can use alloca here to avoid overhead of malloc while keeping free size (within reasonable limits of course).
2017-01-14Merge branch 'blender2.8' into transform-manipulatorsJulian Eisel
Conflicts: source/blender/editors/space_view3d/view3d_edit.c source/blender/editors/space_view3d/view3d_ops.c source/blender/editors/transform/transform_manipulator.c
2016-12-29Merge branch 'master' into blender2.8Bastien Montagne
Please **DO NOT** add changes from master when it's totally uneeded! Changes to BLI_ area most certainly shall *always* be done in master, there is absolutely no point in adding more diff between the two branches than needed, will only makes merging more cumbersome! Conflicts: CMakeLists.txt source/blender/blenlib/intern/math_vector_inline.c
2016-12-29Fix T50334: Also select indirectly imported objects when linking/appending.Bastien Montagne
Since we create a base and instantiate them, they become directly linked, so makes sense to also select them if requested.
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-27Correct bad cast, unused var warningCampbell Barton
2016-12-23Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-12-23Readfile: Resurrect do_versions_after_liblink.Bastien Montagne
Basic idea is to store fileversion in Library datablock, and split again Main by libraries after lib linking, do_versions_after_liblink on those separated Mains, and merge again. This allows to still have correct versions for each data-block in that second do_versions step. Note that this is not used currently in master (might be soon, though), but is needed for 2.8 work.
2016-12-19Fix (unreported) linked datablocks going through do_versions several times.Bastien Montagne
When linking data-blocks from same library in several steps, the already linked data-blocks of same lib would go again through versionning code... Note: only fixed for libraries, I can't imagine how this could happen with local data...
2016-12-16Merge branch 'blender2.8' into transform-manipulatorsJulian Eisel
2016-12-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-12-08Fix crash when opening a Blender file containing Alembic data.Kévin Dietrich
Was also affecting object linking.
2016-12-02Fix T50062: Mask - Clicking in ActivePoint Parent makes Blender crash.Bastien Montagne
Mask primitive adding code was not initializing correctly id_type of points' parents.
2016-12-01UI: Previews for screen layoutsJulian Eisel
Basically all this does is drawing layout previews into the opened layout search menu. https://youtu.be/RHYWtZP7pyA The previews are drawn using offscreen rendering so they can't use multi-threading (yet!). But that shouldn't be an issue since only a handful of previews are drawn at the same time. Normally we only need to redraw the preview if a screen layout was changed. Would be nice if PreviewImage could store if it supports threaded rendering. Previews are saved in files, might be useful if you later want to support appending layouts. Adds a new file screen_draw.c.
2016-12-01Merge branch 'master' into blender2.8Lukas Tönne
2016-11-30Cleanup id->newid usage, initial work.Bastien Montagne
This aims at always ensuring that ID.newid (and relevant LIB_TAG_NEW) stay in clean (i.e. cleared) state by default. To achieve this, instead of clearing after all id copy call (would be horribly noisy, and bad for performances), we try to completely remove the setting of id->newid by default when copying a new ID. This implies that areas actually needing that info (mainly, object editing area (make single user...) and make local area) have to ensure they set it themselves as needed. This is far from simple change, many complex code paths to consider, so will need some serious testing. :/
2016-11-29Merge branch 'blender2.8' into transform-manipulatorsJulian Eisel
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/interface/resources.c source/blender/editors/screen/glutil.c source/blender/gpu/intern/gpu_shader.c
2016-11-19Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_nodes.cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/editors/space_view3d/drawobject.c
2016-11-19Fix forward-compat Nodes write code being executed also for undo steps writing.Bastien Montagne
Forward compatibility code should never, ever be run during undo saving. Note: related to T49991 (but does not fix it either, crash now happens when doing a real file save...).
2016-11-18Fix (unreported) bad handling of brush's fill threshold value.Bastien Montagne
'1' threshold value would only allow to access a third of the basic 'color space' (from black to white, from 0.0 to 1.0 component values), when you expect it to access the whole range. Unfortunately, this needs a subversion bump to allow already defined brushes to keep exact same behavior! Also, did not change default value (0.2) for new brushes, think here keeping current one makes more sense. Thanks to @LucaRood for confirming the issue.
2016-11-16Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-12Sculpt UI: Make DynTopo constant detail a resolution valueJulian Eisel
This should make it easier to sculpt in high resolutions, downside is that the new way to calculate maximum edge length is a bit less intuitive. Maximum edge length used to be calculated as blender_unit * percentage_value, now it's blender_unit / value. Reused old DNA struct member, but had to bump subversion to ensure correct compatibility conversion. Also changed default value slightly (would have had to set to 3.333... otherwise). Was Requested by @monio (see https://rightclickselect.com/p/sculpting/zpbbbc/dyntopo-better-scale-input-in-constant-detail-mode) and I think it's worth testing.
2016-11-09Remove bad storage hacks of old transform manipulatorsJulian Eisel
Got rid of Scene.twcent, Scene.twmin, Scene.twmax, RegionView3D.twmat, RegionView3D.twdrawflag, RegionView3D.tw_idot, TransInfo.mat, TransInfo.vec. Also cleaned-up variable and define names. Decided to completely remove the struct members without doing proper file conversion for non-runtime ones. That will cause minor compatibility breakage but that's okay for 2.8.
2016-11-07Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/addon/properties.py
2016-11-07Expose Bullet rotational spring settings in the UI.Alexander Gavrilov
Bullet spring constraint already supports rotational springs, but they are not exposed in blender UI, likely due to a simple oversight. Supporting them is as simple as adding a few DNA/RNA properties with appropriate UI and passing them on to Bullet. Reviewers: sergof Reviewed By: sergof Differential Revision: https://developer.blender.org/D2331
2016-11-02Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto