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-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-06Cleanup: styleCampbell Barton
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-02Remove brush versioning (again!)Campbell Barton
Causes crash, see c133927bb Merging soc-2017-vertex_paint brought this back by accident.
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-29Merge branch 'master' into blender2.8Campbell Barton
2017-09-29Vertex Paint: Alpha SupportCampbell Barton
GSOC 2017 by Darshan Kadu, see: D2859. This is a partial merge of some of the features from the soc-2017-vertex_paint branch. - Alpha painting & drawing. - 10 new color blending modes. - Support for vertex select in vertex paint mode.
2017-09-28Merge branch 'master' into blender2.8Sergey Sharybin
2017-09-28Adding paint brushes crashes w/ linked libsCampbell Barton
While we could skip this for linked files, convention so far is to only update startup.
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-06Merge branch 'master' into blender2.8Brecht Van Lommel
2017-09-06Fix T52640: crash when opening image file browser in some cases.Brecht Van Lommel
There was some invalid state in the screen here, some areas had sa->full set even though no screen was maximized, which then caused a restore from the wrong (empty) area, which then led to spacedata being empty and a crash. This fix properly clears the sa->full after restore, and also fixes existing .blend files in such an invalid state.
2017-08-03Merge branch 'master' into blender2.8Campbell Barton
2017-08-012.79 release: update version numbers & readfile versionning code.Bastien Montagne
2017-07-05Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-07-05Better fix for sequencer crash when text strip doesn't have effect data.Sybren A. Stüvel
This situation happens when a file with a text effect sequencer strip is loaded in Blender < 2.76 and saved. This destroys the effect data, causing a crash in Blender ≥ 2.76. d2f748a222ad19f prevented the crash when opening such a file, but accessing the strip still caused a crash. This commit fixes that by actually initialising the invalid strip. Of course this still causes data loss, but that already happened by opening & overwriting the file in Blender < 2.76.
2017-07-05Sequencer: Prevent crash when text strip doesn't have effect data.Sybren A. Stüvel
2017-05-25Merge branch 'master' into blender2.8Julian Eisel
2017-05-24Proper fix for crash loading old files with compositorSergey Sharybin
Now we keep all links around, even for sockets which were implicitly renamed. And also ensuring new sockets have proper storage.
2017-05-24Revert "Fix crash opening really old files with compositor"Sergey Sharybin
This commit broke compatibility with newer files: due to rename of Speed to Vector the links got lost. This reverts commit 0e46da76b70a42bab2268942cba0e0d3e4ba47e8.
2017-05-22Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c
2017-05-22Fix T51520: Broken vertex weights after two mesh joining.Bastien Montagne
Root of the issue here was that two stupid modifiers could create named vgroup CD layers (vgroup editing ones... shame on me :") ). Fix that, and added some versionning code to also fix 'corrupted' blend files created by those so far.
2017-05-20Merge branch 'master' into blender2.8Campbell Barton
2017-05-19Fix crash opening really old files with compositorSergey Sharybin
There was lack of certain sockets do-versaions: namely the ones which were added in blender versions after the one used to save the file.
2017-05-19Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/depsgraph_tag.cc source/blender/editors/mask/mask_draw.c
2017-05-16Fix T50673: OpenEXR multilayer image truncated on saveSergey Sharybin
The issue is in OpenEXR itself. See the report fomr some more details.
2017-05-03Merge branch 'master' into blender2.8Lukas Stockner
2017-05-03Render API/Cycles: Identify Render Passes by their name instead of a type flagLukas Stockner
Previously, every RenderPass would have a bitfield that specified its type. That limits the number of passes to 32, which was reached a while ago. However, most of the code already supported arbitrary RenderPasses since they were also used to store Multilayer EXR images. Therefore, this commit completely removes the passflag from RenderPass and changes all code to use the unique pass name for identification. Since Blender Internal relies on hardcoded passes and to preserve compatibility, 32 pass names are reserved for the old hardcoded passes. To support these arbitrary passes, the Render Result compositor node now adds dynamic sockets. For compatibility, the old hardcoded sockets are always stored and just hidden when the corresponding pass isn't available. To use these changes, the Render Engine API now includes a function that allows render engines to add arbitrary passes to the render result. To be able to add options for these passes, addons can now add their own properties to SceneRenderLayers. To keep the compositor input node updated, render engine plugins have to implement a callback that registers all the passes that will be generated. From a user perspective, nothing should change with this commit. Differential Revision: https://developer.blender.org/D2443 Differential Revision: https://developer.blender.org/D2444
2017-04-24Merge branch 'master' into blender2.8Campbell Barton
2017-04-24Cleanup: styleCampbell Barton
2017-03-06Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/space_nla/nla_draw.c source/blender/editors/space_view3d/view3d_draw.c
2017-03-06Surface Deform Modifier: Respect object transforms at bind timeLuca Rood
This slightly changes SDef behavior, by now respecting object transforms at bind time, thus not requiring the objects to be aligned in their respective local spaces, but instead using world space.
2017-02-23Merge branch 'master' into blender2.8Bastien Montagne
2017-02-23Fix T50736: Zero streaks in Glare node.Bastien Montagne
Please never, ever use same DNA var for two different things. Even worse if they do not have same type and ranges! This is only ensuring issues (as described in report, but also if animating both RNA props using same DNA var... yuck). And we were not even saving any byte in DNA, could reuse some padding there to store the two new needed vars (yes, two, since we cannot re-use existing one if we want to keep backward *and* forward compatibility).
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-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-22Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/space_action/action_draw.c
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.
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-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