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
2016-10-13Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-12Fix T49636: material draw mode crash with displacement and missing group ↵Brecht Van Lommel
input node.
2016-09-23Merge branch 'master' into blender2.8Julian Eisel
Conflicts: intern/ghost/intern/GHOST_ContextCGL.mm intern/ghost/intern/GHOST_WindowCocoa.mm source/blender/makesrna/intern/rna_main.c
2016-09-19UI Messages: Consistent spelling of term "data-block"Julian Eisel
Was using a bunch of different spellings, mostly "data-block" though, so went with that one (would have been my #1 choice anyway ;) )
2016-09-16Merge branch 'master' into blender2.8Sergey Sharybin
2016-09-16Fix T49372: Fresnel node: difference between 2.76 and 2.78 GLSL outputSergey Sharybin
2016-09-04Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/blender_particles.cpp source/blender/blenkernel/intern/particle.c source/blender/gpu/intern/gpu_shader.c
2016-08-31Fix T49175: GLSL material crash with environment maps.Brecht Van Lommel
2016-07-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/addon/ui.py source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/particle.c source/blender/blenkernel/intern/particle_distribute.c source/blender/blenkernel/intern/texture.c source/blender/editors/object/object_add.c source/blender/editors/object/object_relations.c source/blender/editors/physics/particle_edit.c source/blender/editors/physics/particle_object.c source/blender/editors/transform/transform_snap_object.c
2016-07-04BI Viewport(GLSL): support for envmap in Texture nodeAlexander Romanov
This patch is another step to achieve BI and it's Viewport consistency for cubemap textures. {F318879} To test world_space_shading flag D2072 is required. Alexander (Blend4Web Team) Reviewers: campbellbarton, brecht Subscribers: homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D2074
2016-07-02Cleanup: comment blocksCampbell Barton
2016-06-27Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/pointcache.c source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-06-23Cycles: Add multi-scattering, energy-conserving GGX as an option to the ↵Lukas Stockner
Glossy, Anisotropic and Glass BSDFs This commit adds a new distribution to the Glossy, Anisotropic and Glass BSDFs that implements the multiple-scattering microfacet model described in the paper "Multiple-Scattering Microfacet BSDFs with the Smith Model". Essentially, the improvement is that unlike classical GGX, which only models single scattering and assumes the contribution of multiple bounces to be zero, this new model performs a random walk on the microsurface until the ray leaves it again, which ensures perfect energy conservation. In practise, this means that the "darkening problem" - GGX materials becoming darker with increasing roughness - is solved in a physically correct and efficient way. The downside of this model is that it has no (known) analytic expression for evalation. However, it can be evaluated stochastically, and although the correct PDF isn't known either, the properties of MIS and the balance heuristic guarantee an unbiased result at the cost of slightly higher noise. Reviewers: dingto, #cycles, brecht Reviewed By: dingto, #cycles, brecht Subscribers: bliblubli, ace_dragon, gregzaal, brecht, harvester, dingto, marcog, swerner, jtheninja, Blendify, nutel Differential Revision: https://developer.blender.org/D2002
2016-06-23Merge branch 'master' into blender2.8Campbell Barton
2016-06-22ID-Remap - Step one: core work (cleanup and rework of generic ID datablock ↵Bastien Montagne
handling). This commit changes a lot of how IDs are handled internally, especially the unlinking/freeing processes. So far, this was very fuzy, to summarize cleanly deleting or replacing a datablock was pretty much impossible, except for a few special cases. Also, unlinking was handled by each datatype, in a rather messy and prone-to-errors way (quite a few ID usages were missed or wrongly handled that way). One of the main goal of id-remap branch was to cleanup this, and fatorize ID links handling by using library_query utils to allow generic handling of those, which is now the case (now, generic ID links handling is only "knwon" from readfile.c and library_query.c). This commit also adds backends to allow live replacement and deletion of datablocks in Blender (so-called 'remapping' process, where we replace all usages of a given ID pointer by a new one, or NULL one in case of unlinking). This will allow nice new features, like ability to easily reload or relocate libraries, real immediate deletion of datablocks in blender, replacement of one datablock by another, etc. Some of those are for next commits. A word of warning: this commit is highly risky, because it affects potentially a lot in Blender core. Though it was tested rather deeply, being totally impossible to check all possible ID usage cases, it's likely there are some remaining issues and bugs in new code... Please report them! ;) Review task: D2027 (https://developer.blender.org/D2027). Reviewed by campbellbarton, thanks a bunch.
2016-06-21Merge branch 'master' into blender2.8Campbell Barton
2016-06-18Cleanup: style, whitespace, doxy filepathsCampbell Barton
2016-06-17Fix T48662: Blender crash using node groups connected with displacement ↵Sergey Sharybin
output in some situations
2016-06-15Merge branch 'master' into blender2.8Campbell Barton
2016-06-14Fix T48613: Bump mapping in cycles is not shown on the viewport when the ↵Sergey Sharybin
material use node groups
2016-06-07World space switch for BI nodes.Alexander Romanov
At the moment light shading in Blender is produced in viewspace. Apparently, that's why shader nodes work with normals in camera space. But it is not convenient for artists. The more convenient approach is implemented in Cycles where normals are represented in world space. Blend4Web Team designed the engine keeping in mind shader parameters readability, so normals are interpreted in world space as well. And now our users have to use some tweaks, like empty node group with the name "Replace", which is replacing one input by another on the engine side (replacing working configuration in Blender Viewport by the configuration that has the same behavior in the engine). This patch adds the ability to switch to world space for normals and lamp vector in BI and Viewport. This patch is very important to us and we crave to see this patch in Blender 2.7 because it will significantly simplify Blend4Web material creation workflow. {F315547} {F315548} Reviewers: campbellbarton, brecht Reviewed By: brecht Subscribers: homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D2046
2016-06-07World space switch for BI nodes.Alexander Romanov
At the moment light shading in Blender is produced in viewspace. Apparently, that's why shader nodes work with normals in camera space. But it is not convenient for artists. The more convenient approach is implemented in Cycles where normals are represented in world space. Blend4Web Team designed the engine keeping in mind shader parameters readability, so normals are interpreted in world space as well. And now our users have to use some tweaks, like empty node group with the name "Replace", which is replacing one input by another on the engine side (replacing working configuration in Blender Viewport by the configuration that has the same behavior in the engine). This patch adds the ability to switch to world space for normals and lamp vector in BI and Viewport. This patch is very important to us and we crave to see this patch in Blender 2.7 because it will significantly simplify Blend4Web material creation workflow. {F315547} {F315548} Reviewers: campbellbarton, brecht Reviewed By: brecht Subscribers: homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D2046
2016-06-01Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/blender_curves.cpp intern/cycles/blender/blender_particles.cpp source/blender/depsgraph/intern/builder/deg_builder_relations.h source/blender/depsgraph/intern/depsgraph_build.cc
2016-05-30Support all Cycles image texture projections in the GLSL viewportRalf Hölzemer
This patch enables Tube, Sphere and Box projections in GLSL for the image texture node. Reviewers: sergey Projects: #nodes, #opengl_gfx Differential Revision: https://developer.blender.org/D2036
2016-05-28Fix T48533: camera node view vector wrong for Cycles GLSL.Ralf Hölzemer
Reviewed By: brecht Differential Revision: https://developer.blender.org/D2033
2016-05-27more correct Normal Map node behavior for tangent mapping in Cycles ViewportAlexander Romanov
2016-05-24Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/blender_curves.cpp source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/particle.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/physics/particle_edit.c source/blender/editors/transform/transform_snap_object.c source/blender/editors/util/undo.c source/blender/makesrna/intern/rna_object_force.c
2016-05-23Enable correct GLSL output for cycles normalmap nodeRalf Hölzemer
See T48453 for details and test scenes Reviewers: a.romanov, sergey Reviewed By: a.romanov, sergey Projects: #opengl_gfx, #nodes Differential Revision: https://developer.blender.org/D2011
2016-05-23Support Vertex Color in GLSL viewport for CyclesSergey Sharybin
The title says it all actually. Added special custom data type, because we don't know in advance whether we're referencing UV or Color layer. Also made it so vertex attributes are normalized. TODO: Border render in viewport ignores the normalization of the attribute array for some reason, will be looked into still. Reviewers: mont29, brecht, campbellbarton Reviewed By: brecht, campbellbarton Differential Revision: https://developer.blender.org/D2022
2016-05-22Support Musgrave texture for Cycles GLSL viewportSergey Sharybin
Only for non-OSX viewport!
2016-05-22Fix missing Ignore option for GLSL bumpSergey Sharybin
2016-05-22Cycles: Support bump mapping in GLSL viewportSergey Sharybin
This commit implements Bump node in GLSL, making it possible to see previews of bump mapping in viewport without need to render. Nothing really fancy going on here, just uses internal dFdx/dFdy functions to get derivatives of the surface and map itself. Quite basic but seems to behave correct-ish. This commit also makes Displacement material output to affect viewport shading by re-linking unconnected Normal input to a node which was used for displacement output (via Bump node). Intention of all this is to make it really easy to do bump map painting with Cycles as an active render engine. Reviewers: campbellbarton, mont29, brecht, psy-fi Reviewed By: brecht Subscribers: Blendify, eyecandy Differential Revision: https://developer.blender.org/D2014
2016-05-20Support Cycles wave texture in GLSL viewport.Thomas Dinges
2016-05-20Support Cycles noise texture in GLSL viewportSergey Sharybin
2016-05-20Support voronoi texture in GLSL shadingSergey Sharybin
It gives some slight differences on the plane corners, but can't really figure out source of the issue here yet. It's still better than fully white texture for the previews anyway. At this point we should perhaps ifdef chunks of the code in order to have faster GLSL compilation and probably even faster compiled code. Will look into this shortly.
2016-05-20Support Cycles magic texture in GLSL viewportSergey Sharybin
2016-05-20Support gradient Cycles texture in GLSL viewportSergey Sharybin
2016-05-20Support Cycles brick texture in GLSL viewportSergey Sharybin
2016-05-20Support Cycles's checker texture in GLSL shadingSergey Sharybin
2016-05-05Cleanup: styleCampbell Barton
2016-05-03Fix T47424: Blender Internal material node 'mapping' not showing results of ↵Sergey Sharybin
animation Not very efficient solution -- it'll update mapping node on init ntree exec and will not work for viewport GLSL shading perhaps, but it's as good as it could be within current dependency graph. The issue here is that manual edit of values will cause cached matrix re-evaluation. but using animation does not use rna update callbacks hence no matrix update was happening.
2016-04-28Merge branch 'master' into temp_remove_particlestemp_remove_particlesLukas Tönne
2016-04-27Fix Cycles GLSL image texture node not respecting color space property.Brecht Van Lommel
2016-04-27Code cleanup: minor cleanups for GPU_link return values, normal map node.Brecht Van Lommel
2016-04-26Support multiple tangents for BI render & viewportAlexander Romanov
Normal Map node support for GLSL mode and the internal render (multiple tangents support). The Normal Map node is a useful node which is present in the Cycles render. It makes it possible to use normal mapping without additional material node in a node tree. This patch implements Normal Map node for GLSL mode and the internal render. Previously only the active UV layer was used to calculate tangents.
2016-04-25Refactor BKE_blender into separate headersCampbell Barton
- BKE_blender_version.h (only version defines & versionstr). - BKE_blender_copybuffer.h (currently only used for view3d copy/paste). - BKE_blender_undo.h (global undo functions). - BKE_blendfile.h (high level blend file read/write API).
2016-04-13Removed particle DNA.Lukas Tönne
2016-04-05Revert "Cycles: Remove the Preetham Sky model."Thomas Dinges
This reverts commit d91316dc672dc1ee69fbd24d2f00124a24b75c6b.
2016-04-03Cycles: Remove the Preetham Sky model.Thomas Dinges
The improved Hosek / Wilkie model was added during my GSoC 2013 and the default since then. The older model was kinda kept for compatibility, but after more than 2 years it's time to remove it. The Hosek / Wilkie model is more realistic anyway, and people who really want a day / night transition can mix the Sky Shader with another one (e.g. color) and fade between the two.
2016-03-21Mirror influence of environment texture in Blender viewportAlexander Romanov
This patch implements Mirror influence for environment textures. Approach matches the one from BI. {F281871} See the video https://youtu.be/BskgCv6dcIE Example: {F281876} Alexander (Blend4Web Team) Reviewers: campbellbarton, merwin, brecht Reviewed By: brecht Subscribers: TwisterGE, blueprintrandom, youle, Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D1786