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-08-15Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/makesrna/intern/rna_render.c
2017-08-15Alembic import: report object name in face color index out of bounds errorSybren A. Stüvel
2017-08-15Alembic import: fix crash when face color index is out of bounds.Sybren A. Stüvel
This can happen with Alembic files exported from Maya. I'm unsure as to the root cause, but at least this fixes the crash itself. Thanks to @looch for reporting this with a test file. The test file has to remain confidential, though, so it's on my workstation only.
2017-08-09Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-08-09Fix T52240: Alembic Not Transferring Materials Per FrameSybren A. Stüvel
When a mesh changes its number of vertices during the animation, Blender rebuilds the DerivedMesh, after which the materials weren't applied any more (causing the default to the first material slot).
2017-08-09Alembic: Renamed variable assigned_name → assigned_matSybren A. Stüvel
The variable is a pointer to a Material, not to a name/string.
2017-07-21Pass EvaluationContext argument everywhereLuca Rood
Note that some little parts of code have been dissabled because eval_ctx was not available there. This should be resolved once DerivedMesh is replaced.
2017-07-11Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-07-11Fix T52022 Alembic Inherits transform not taken into accountSybren A. Stüvel
Alembic's "inherits transform" flag wasn't taken into account when constructing the parent object relations.
2017-07-03Merge branch 'master' into blender2.8Alexander Romanov
2017-07-03Alembic: renamed offset → sequence_offsetSybren A. Stüvel
2017-06-19Merge branch 'master' into blender2.8Campbell Barton
2017-06-19Cleanup: doxygen commentsCampbell Barton
Also remove duplicate & mismatching comments from grease-pencil header. Keep comments close to implementation to avoid getting out of sync.
2017-06-02Merge branch 'master' into blender2.8Campbell Barton
2017-06-02Cleanup: styleCampbell Barton
2017-05-31Merge branch 'master' into blender2.8Sergey Sharybin
2017-05-30Alembic import: fixed bug interpolating between frames.Sybren A. Stüvel
2017-05-30Alembic: simplified sub-frame samplingSybren A. Stüvel
It's now less confusing (for example, using nr_of_samples directly, instead of using 1 / 1 / nr_of_samples). Might also have fixed a bug. Also added unittests.
2017-05-30Alembic export: normalise the homogeneous component after scalingSybren A. Stüvel
The scale matrix must have its homogeneous 'w' (at mat[3][3]) set to the scale in order to also scale the translations along with it. However, this also scales the transform matrix's 'w' component, which is not supposed to happen.
2017-05-30Alembic export: avoid create-and-reset of shared pointerSybren A. Stüvel
Constructing the shared pointer where the object is actually allocated makes the code a bit clearer.
2017-05-30Alembic export: prevent rounding error buildup in frame sample timeSybren A. Stüvel
2017-05-26Rename BKE_layer_collection_active > BKE_layer_collection_get_activeDalai Felinto
2017-05-26Merge branch 'master' into blender2.8Campbell Barton
2017-05-26[MSVC] Fix build error. linker was searching for a mangled version of versionstrlazydodo
2017-05-25TexFace removal part 3Campbell Barton
- MTexPoly structure & layer type. - The 'Mesh.uv_textures' layers. - DerivedMesh TexFace drawing. - Scripts & UI.
2017-05-24Merge branch 'master' into blender2.8Campbell Barton
2017-05-24Alembic: Export mesh as mesh, even when it has no vertices.Sybren A. Stüvel
This makes it possible to have an animated / procedurally generated mesh that starts empty and obtains data in later frames. Fixes the export of an empty mesh with an Ocean Modifier, as described in issue T51351.
2017-05-24Alembic export: consider mesh with animation data as "animated"Sybren A. Stüvel
This allows you to put any kind of animation data on the mesh, and its shape will be exported on each timekey. Note that this timekey is unrelated to the animation data (so we don't export on each keyframe, for example). A practical example is the addition of an animated custom property to trigger the export of animated mesh data. The mesh data can then be created from any source, like Python scripts. Not only is this useful in itself, it also provides a workaround for one of the two issues described in T51351.
2017-05-24Alembic export: write Blender version to Alembic fileSybren A. Stüvel
This is written in a custom metadata key, so it isn't shown by utilities like abcecho or abcls. However, it's still something that's useful to have available.
2017-05-24Fix T51586: Regression: Alembic containing animated curves / hair no longer ↵Sybren A. Stüvel
working Also fixed the same type of error when reading points.
2017-05-23Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-05-23Fix T51534: Alembic: added support for face-varying vertex coloursSybren A. Stüvel
Houdini writes vertex data in a different format than Blender does; Houdini uses "face-varying scope", which means that the vertex colours are indexed by an ever-increasing number over all vertices of all faces instead of the vertex index. I've also merged the read_custom_data_mcols() and read_mcols() functions, because the latter was only called from the former, and the changes in this commit would add yet more function parameters to pass.
2017-05-23Alembic: reduced code duplication in read_mcols()Sybren A. Stüvel
A big chunk of code was copied between the if and else bodies. By using a boolean to store whether the c3f_ptr or c4f_ptr should be used, the in-loop condition is kept as simple as possible.
2017-05-23Alembic: split up read_custom_data_ex() into read_custom_data_{mcols,uvs}()Sybren A. Stüvel
The read_custom_data_ex() function was basically two functions inside if/else bodies.
2017-05-23Fix T51319: Alembic export crash w/simple child particles if Display value < ↵Sybren A. Stüvel
100% This was two-fold. 1) The export used viewport settings to obtain the particle cache, rather than render settings. 2) The child hair writer tried to obtain UV-coordinates from the parent chair, without checking whether those were available in the first place.
2017-05-20Merge branch 'master' into blender2.8Campbell Barton
2017-05-20CMake: Use GCC7's -Wimplicit-fallthrough=5Campbell Barton
Use to avoid accidental missing break statements, use ATTR_FALLTHROUGH to suppress.
2017-04-28Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-04-28Alembic: use object-oriented approach in ABC_read_mesh()Sybren A. Stüvel
This is easier to extend than the if/else if/else chain that was in place, and allows for somewhat more granular error messages.
2017-04-28Alembic: Construct ISampleSelector once and pass alongSybren A. Stüvel
2017-04-26Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/alembic/intern/abc_exporter.cc
2017-04-26Alembic export: support simple child hairs (Fix T51144)Sybren A. Stüvel
Simple child hairs don't have a face index number assigned, so the call to dm->getTessFaceData(dm, num, CD_MFACE) would cause a crash. To work around this, UV and normal vectors are copied from the parent hair. I've also removed an unnecessary call to dm->getTessFaceArray(dm); Reviewers: kevindietrich Differential Revision: https://developer.blender.org/D2638
2017-04-26Alembic: fixed indentationSybren A. Stüvel
2017-04-26Alembic: fixed memory leaksSybren A. Stüvel
2017-04-26Alembic: fixed refcount issue when duplicating imported objectsSybren A. Stüvel
Duplicating an imported object didn't increment the cache reader's refcount, whereas removing the duplicate did decrement it. This caused problems.
2017-04-26Avoid platform dependant PATH_MAXCampbell Barton
2017-04-26Alembic export: also export emptiesSybren A. Stüvel
Exporting an empty creates an Alembic XForm object. The empties can also be animated.
2017-04-26Alembic export: renamed func object_is_shape → object_type_is_exportableSybren A. Stüvel
The function doesn't return whether the object is a shape at all, since it also returns true for camera objects (and soon also for empties). It returns true when objects of this type can be exported to Alembic at all. This is now reflected in the name.
2017-04-26Alembic: fixed C++98 compatibilitySybren A. Stüvel
2017-04-25Merge branch 'master' into blender2.8Sybren A. Stüvel