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
2018-05-07Merge branch 'master' into blender2.8Campbell Barton
2018-05-07Cleanup: rename char/float conversion functionsCampbell Barton
- FTOCHAR -> unit_float_to_uchar_clamp - F3TOCHAR3 -> unit_float_to_uchar_clamp_v3 (swap args) - F4TOCHAR4 -> unit_float_to_uchar_clamp_v4 (swap args) - FTOUSHORT -> unit_float_to_ushort_clamp - USHORTTOUCHAR -> unit_ushort_to_uchar
2018-04-28Cleanup: fix compiler warnings on macOS / clang.Brecht Van Lommel
2018-04-20Merge remote-tracking branch 'origin/master' into blender2.8Gaia Clary
2018-04-20Fix: D3160 Propose to use proper typedefs to avoid confusionGaia Clary
Differential Revision: https://developer.blender.org/D3160
2018-04-19Remove Blender Internal and legacy viewport from Blender 2.8.Ton Roosendaal
Brecht authored this commit, but he gave me the honours to actually do it. Here it goes; Blender Internal. Bye bye, you did great! * Point density, voxel data, ocean, environment map textures were removed, as these only worked within BI rendering. Note that the ocean modifier and the Cycles point density shader node continue to work. * Dynamic paint using material shading was removed, as this only worked with BI. If we ever wanted to support this again probably it should go through the baking API. * GPU shader export through the Python API was removed. This only worked for the old BI GLSL shaders, which no longer exists. Doing something similar for Eevee would be significantly more complicated because it uses a lot of multiplass rendering and logic outside the shader, it's probably impractical. * Collada material import / export code is mostly gone, as it only worked for BI materials. We need to add Cycles / Eevee material support at some point. * The mesh noise operator was removed since it only worked with BI material texture slots. A displacement modifier can be used instead. * The delete texture paint slot operator was removed since it only worked for BI material texture slots. Could be added back with node support. * Not all legacy viewport features are supported in the new viewport, but their code was removed. If we need to bring anything back we can look at older git revisions. * There is some legacy viewport code that I could not remove yet, and some that I probably missed. * Shader node execution code was left mostly intact, even though it is not used anywhere now. We may eventually use this to replace the texture nodes with Cycles / Eevee shader nodes. * The Cycles Bake panel now includes settings for baking multires normal and displacement maps. The underlying code needs to be merged properly, and we plan to add back support for multires AO baking and add support to Cycles baking for features like vertex color, displacement, and other missing baking features. * This commit removes DNA and the Python API for BI material, lamp, world and scene settings. This breaks a lot of addons. * There is more DNA that can be removed or renamed, where Cycles or Eevee are reusing some old BI properties but the names are not really correct anymore. * Texture slots for materials, lamps and world were removed. They remain for brushes, particles and freestyle linestyles. * 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and other renderers use this to find all panels to show, minus a few panels that they have their own replacement for.
2018-04-17Fix blenderplayer and collada build.Brecht Van Lommel
2018-04-16Depsgraph: remove EvaluationContext, pass Depsgraph instead.Brecht Van Lommel
The depsgraph was always created within a fixed evaluation context. Passing both risks the depsgraph and evaluation context not matching, and it complicates the Python API where we'd have to expose both which is not so easy to understand. This also removes the global evaluation context in main, which assumed there to be a single active scene and view layer. Differential Revision: https://developer.blender.org/D3152
2018-04-16Merge branch 'master' into blender2.8Campbell Barton
2018-04-16Cleanup: indentationCampbell Barton
2018-04-16Merge branch 'master' into blender2.8Campbell Barton
2018-04-16Cleanup: indentationCampbell Barton
2018-04-16Fix stubsCampbell Barton
2018-04-15Merge branch 'master' into blender2.8Campbell Barton
2018-04-15Cleanup: remove bad castsCampbell Barton
2018-04-15Cleanup: ED_armature namingCampbell Barton
- Wasn't clear which functions handle edit-bones. - Mixed both ebone and edit_bone in names. - Didn't use ED_armature_* prefix for public API. See P655 to apply to branches.
2018-04-08Merge branch 'master' into blender2.8Sybren A. Stüvel
2018-04-06Fix Collada: nullptr is a c++11 keyword. Changed to NULLGaia Clary
2018-04-06Fix Collada: Import of animations for objects with multiple materialsGaia Clary
When importing multiple materials for one object, the imported material animation curves have all been assigned to the first material in the object. This fix also improves the console logging whenever the importer finds a consistency problem with the imported animation data.
2018-04-05Remove workspace object mode, reverts changes w/ 2.8Campbell Barton
This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details.
2018-03-29Merge commit 'origin/master^' into blender2.8Dalai Felinto
2018-03-28Fix Collada: broken tangents with Camera Animation import for xfovGaia Clary
When importing an xfov curve, we must transformed the data to Lens opening angles in degrees. While the curve value itself is correctly transformed, the transformation of the tangents has been forgotten. this is fixed now.
2018-03-17Merge branch 'master' into blender2.8Gaia Clary
2018-03-17Refactor: Collada: remove param, changed order of params in Function callGaia Clary
* In the Collada Module parameters are typically ordered in a similar way. I changed this to: extern std::string get_joint_id(Object *ob, Bone *bone); * The Object parameter was not used in get_joint_sid(). I changed this to: extern std::string get_joint_sid(Bone *bone);
2018-03-12Merge remote-tracking branch 'origin' into blender2.8Gaia Clary
2018-03-11fix Collada: wrong usage of pointer and hidden redeclarationGaia Clary
* Suspicious usage of pointer: short *type = 0; // this creates a null pointer When this is later used for anything then blender would crash. After following the code and check what happens i strongly believe the author wanted to use a short and not a pointer to a short here. * local variable where reused later in same function While this did no harm, i still felt it was better to use a different name here to make things more separated: - moved variable declaraiotns into loop (for int a=0; ...) - renamed uv_images to uv_image_set - renamed index variable from i to j in inner loop that reused same index name from outer loop
2018-03-11Cleanup Collada: Removed duplicate variable settingGaia Clary
2018-03-11Cleanup: avoid redeclaration of iterator in same functionGaia Clary
The iterator was redeclared 3 times. I fixed this to avoid future issues. I commit separately because so the changes are less cluttered all over the place.
2018-03-11Cleanup Collada: Avoid unintentional reuse of previous defined variableGaia Clary
The variable child was redeclared multiple times in the same function. While this has not created any issues i still changed this to avoid confusion and keep the usage of the variables more local.
2018-03-11Fix Collada: Avoid unnecessary and even wrong check on unavailable dataGaia Clary
The function validateConstraints() potentially causes a null pointer exception. I changed this so that the function returns a failure as soon as the validation fails. This avoids falling into the null pointer trap.
2018-03-11Cleanup Collada: Make sure index variables are not reusedGaia Clary
The variables i and j have been declared before in the same function. I changed the names to mi and mj to keep things clear.
2018-03-11Cleanup Collada: make sure float array is initialisedGaia Clary
This is just to silence a compiler warning and keeping the code clean. The actual code never uses uninitialised array elements.
2018-03-11Refactor Collada: combined 2 almost identical functions into oneGaia Clary
The 2 methods add_bezt() and create_bezt() do almost the same. I combined them both into add_bezt() and added the optional parameter eBezTriple_Interpolation ipo
2018-03-09Cleanup: iterator macrosAntonio Vazquez
This line was missing in previous commit
2018-03-09Cleanup: iterator macrosCampbell Barton
- put render iterator in own scope (would shadow it's own variable if used multiple times). - enforce semicolon at end of iterator macros. - no need to typedef one-off macro structs.
2018-03-07Cleanup: use _BEGIN suffix for group iteratorsCampbell Barton
2018-03-01Cleanup: macro's w/ an _END need a matching _BEGINCampbell Barton
Convention from 2.7x, since some looping macros don't need an '_END', it avoids confusion to keep this.
2018-02-28merge from master (needed to fix collada headerfiles which have been ↵Gaia Clary
modified in master and in blender2.8 slightly different)
2018-02-28collada: EvaluationContext is now feeded into the class instances of ↵Gaia Clary
AnimationExporter and DocumentExporter on creation. Also skipped the const qualifier for now because BKE_scene_graph_update_for_newframe() needs it to be not const
2018-02-28Collada: Make EvaluationContext const as its only used for reading hereGaia Clary
2018-02-28collada: call from operator to Collada exporter/importer now uses structures ↵Gaia Clary
instead of passing many parameters
2018-02-28Collada: Moved structure definitions for export settings to the ↵Gaia Clary
exportSettings.h Also make typedefs for import/export structures.
2018-02-27merge Collada changtes from masterGaia Clary
2018-02-27Collada: commented out code was previously left over with an unresolved ↵Gaia Clary
conflict in it. Deleting as its no longer needed
2018-02-27Collada: Remove obsolete codeGaia Clary
2018-02-27fix: Collada Matrixdata Importer tried to fix rotations where nothing was to ↵Gaia Clary
fix. The matrixdata import is now only doing a matrix decompose and then pplies the decomposed values to 3 trans-, 3 scale- and 4 rot-curves)
2018-02-27Collada: removed unnecessary dup[licate matrix conversion in matrix data ↵Gaia Clary
exporter
2018-02-27Merge branch 'master' into blender2.8Sergey Sharybin
2018-02-27Collada: Remove unused vector of flaot[4][4] valuesSergey Sharybin
Was in fact causing issues on macOS, something to do with a destructor.
2018-02-27Collada: Use floating point version of abs()Sergey Sharybin
Avoids implicit cast of float to int.