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-31Merge branch 'master' into blender2.8Sergey Sharybin
2017-05-30Displace modifier: Pre-fetch all possible images to image pool prior executionSergey Sharybin
This way we reduce amount of time wasted in spin-lock later on when all threads are starting to sample texture.
2017-05-26Merge branch 'master' into blender2.8Campbell Barton
2017-05-26Fix integer overflows in meshcache modifier.lazydodo
Differential Revision: https://developer.blender.org/D2688
2017-05-25TexFace removal part 3Campbell Barton
- MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-24TexFace removal part 2Campbell Barton
- Derived-mesh drawing. - All non UV members of TexFace structs. MTexPoly is now redundant but keeping with a dummy member, will check on complete removal later.
2017-05-24Remove TexFace, per-face imagesCampbell Barton
TexFace complicates the now more popular shading pipeline by having per-face images, see: T51382 for details. To keep the ability to select a per-material edit-image (used with UV-mapping workflow), the material now stores an image which will be set when changing images in edit-mode. This is used as a bake-target when not using Cycles too.
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-19Remove reference to WITH_GL_PROFILE_COREDalai Felinto
There is no more point of keep those around. ES20 may need special case when/if we dabble with it again. Meanwhile no point on polluting the code with this. (ghost still has reference for the PROFILE, but that's reasonable)
2017-05-11Remove warnings after CDDM fixDalai Felinto
2017-05-11Support drawing of solid mode CDDM with core profileSergey Sharybin
Nothing terribly exciting, just a hackish implementation of solid mode CDDM drawing for cases when we are building with core profile. The goal is to be able to see SOMETHING with new OpenGL for thew guys who tests alembic and friends in blender2.8 branch. This is a temporary solution, the whole drawing will be reworked. Limited to hardcoded material and lighting. Selection outline color is also hardcoded because of lack of glColor() in the core profile. After this commit there is no big stoppers from stop worrying about legacy OpenGL, so we can go core profile as the only way for Blender. While some areas will become broken after that, we'd better just fix them after that and for now just focus on more important design work.
2017-05-05Merge branch 'master' into blender2.8Julian Eisel
2017-05-05Fix (unreported) memleak in Warp modifier copying.Bastien Montagne
2017-04-24Convert BaseLegacy to Base (part)Luca Rood
2017-04-24Merge branch 'master' into blender2.8Campbell Barton
2017-04-24Cleanup: styleCampbell Barton
2017-04-21Merge branch 'master' into 28Campbell Barton
2017-04-20Fix Surface Deform not unbinding if target is removedLuca Rood
2017-04-18Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2017-04-17Fix T51176: Cache file location can be blank and prevent fluid simulation ↵Bastien Montagne
from reading baked data Sanitize a bit how cache path is handled by fluidsim (there is much more to be done here though :( ), and forbid empty path (we reset to default path relative to current .blend file in case it's empty). If people really, really want to use current OS-wise directory, they can at least use '.' as path. ;)
2017-04-17Fluidsim cleanup: get rid of magic numbers!Bastien Montagne
2017-04-14Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/alembic/intern/abc_exporter.cc
2017-04-13Fix Surface Deform crash with missing or freed DMLuca Rood
2017-04-07Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/alembic/intern/abc_exporter.h # source/blender/alembic/intern/abc_util.cc
2017-04-07Alembic: just pass NULL when we know mcmd->reader is NULL.Sybren A. Stüvel
More explicit, easier to read & understand.
2017-04-06Depsgraph: Remove old depsgraph header from modifiersSergey Sharybin
2017-04-06Depsgraph: More type definitions to new depsgraph headerSergey Sharybin
2017-04-05Cleanup: Remove legacy depsgraph private header from modifiersSergey Sharybin
2017-04-05Cleanup, remove unused functionSergey Sharybin
2017-04-05Depsgraph: Remove all layer bit flags related checksSergey Sharybin
These bits became obsolete with the new layer system, so we can simplify some code around them or avoid existing workarounds which were trying to keep things working for them. There are still work needed to be done for on_visible_change to avoid unnecessary updates, but that can also happen later.
2017-03-31Merge branch 'master' into blender2.8Campbell Barton
2017-03-30Mirror Modifier: Add offsets for mirrored UVsCampbell Barton
The mirror modifier now has two fields that specify a -1 to 1 offset for the U and V axes when mirroring their coordinates. D1844 by @circuitfox
2017-03-25Merge branch 'master' into blender2.8Campbell Barton
2017-03-21Fix T51012: Surface modifier was not working with curvesGermano Cavalcante
This prevented the Force Field Curve Shape of working
2017-03-20Merge branch 'master' into blender2.8Campbell Barton
2017-03-19Usual UI/i18n message fixes.Bastien Montagne
Please provide valid description for SurfaceDeform modifier tooltip. Such place-holders should not pass final checks before merging in master!
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-03-05Fix T50855: Intersect (knife) w/o separate doesn't selectCampbell Barton
2017-03-04Fix T50838: Surface Deform DM use after free issueLuca Rood
Implementd fix suggested by @sergey in T50838.
2017-03-01Merge branch 'master' into blender2.8Campbell Barton
2017-03-01Cleanup: code-style, duplicate headerCampbell Barton
2017-02-27Merge branch 'master' into blender2.8Luca Rood
2017-02-27Surface Deform Modifier (SDef)Luca Rood
Implementation of the SDef modifier, which allows meshes to be bound by surface, thus allowing things such as cloth simulation proxies. User documentation: https://wiki.blender.org/index.php/User:Lucarood/SurfaceDeform Reviewers: mont29, sergey Subscribers: Severin, dfelinto, plasmasolutions, kjym3 Differential Revision: https://developer.blender.org/D2462
2017-02-23Merge branch 'master' into blender2.8Bastien Montagne
2017-02-23Silence "defined but not used" warningsDalai Felinto
2017-02-19Fix a few compiler warnings with macOS / clang.Brecht Van Lommel
2017-02-14Sorted BaseLegacy > Base convertionsDalai Felinto
Including bring back UV Edit show other objects
2017-02-08Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/blenloader/intern/writefile.c