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-03Make IDP_MergeGroup recursiveDalai Felinto
With this we also do not need IDP_MergeGroupValues anymore. If this causes problems in the future we can always make recursion an option (like overwrite is).
2017-05-03Fix crash loading files where outliner treestore isn't setCampbell Barton
2017-05-03Add BBone and Wire Armature draw types to DrawManager.Bastien Montagne
Most of this was copying/adapting code from octahedral existing draw code, tough part was to get BBone matrices to behave as expected, they are using a fairly specific setup... Addresses T51365 and T51362.
2017-05-03Draw Manager: fix draw-state switching logicCampbell Barton
Changing states didn't properly reset between shading groups causing the GL state to be wrong based on draw order. States are now only set when changed.
2017-05-02Cleanup: typedef for empty listCampbell Barton
Without this the intent isn't clear.
2017-05-02Workaround external engines with OpenGL renderingCampbell Barton
For now just do the OpenGL render and don't render using the engine. This is a slightly odd-use case since it makes more sense to do a regular render.
2017-05-02Cleanup: consistent arg orderCampbell Barton
2017-05-02Draw Manager: OpenGL render supportCampbell Barton
Works for clay-engine but doesn't draw objects with eevee.
2017-05-02Draw Manager: split DRW_draw_view into 2 functionsCampbell Barton
Needed for offscreen render
2017-05-02Cleanup: use depsgraph for scene/layer accessCampbell Barton
2017-05-02Merge branch 'master' into blender2.8Sergey Sharybin
2017-05-02Cycles: Fix missing type declaration in OpenCL imageSergey Sharybin
Spotted by Mai in IRC, thanks!
2017-05-02Revert "Depsgraph: Link from material to object shading"Sergey Sharybin
The change was initially needed for Blender 2.8 branch but the actual function was reverted in there. So no reason to keep dead unused placeholder in the dependency graph. This reverts commit fd69ba225540cde5e4c1fa651fb02df21ea0a143.
2017-05-02Merge branch 'master' into blender2.8Sergey Sharybin
2017-05-02Draw Manager: No need of glScissor for external enginesDalai Felinto
2017-05-02Cycles integration with Draw ManagerDalai Felinto
We can now use object and other modes on top of Cycles. Since we are now always on "render_to_view" (old Rendered mode), the pause button is always visible.
2017-05-02OCIO: Fix crash cause by bad IMM usable.Clément Foucault
2017-05-02Cycles: Fix CUDA split kernelSergey Sharybin
Global size y needs to be a multiple of 16.
2017-05-02Cycles: Cache split kernels in CUDA deviceSergey Sharybin
This way we don't re-load kernels for every sample in the viewport. Additionally, we don't risk global size changed inbetween of samples.
2017-05-02RNA: Remove remaining relevant scene->basact and BaseLegacyDalai Felinto
Note: In one case (rna_Scene_editmesh_select_mode_set) I had to resort to the temporary solution of BKE_scene_layer_context_active. This is fine for now, but it will be a problem once workspaces are introduced. In this case the fix is to use a temporary value in the set routine, and actually only set the active object in the update function (which can take bContext).
2017-05-02Add scene argument for notifiersCampbell Barton
From workspaces branch
2017-05-01Eevee: Add support for legacy materials node. (not PBR)Clément Foucault
2017-05-01GPUMaterial: Making material node tree compatible with new drawmanager.Clément Foucault
- code_generate_fragment : Making sure that shaders uses the new uniforms. - code_generate_vertex_new : create require attribute based on their names and not their id (see draw_cache_impl_mesh.c). - add support for ramp textures.
2017-05-01Mesh Batch Cache: Add support for uv/vcol/tangent data layers.Clément Foucault
This is a bad implementation waiting for some improvement that are : - Gawain support for multiple names. -> will remove duplication of attribute alloc - Glsl safe name string escaping. -> will remove any risk of hash colision. Old glsl drawing was relying on attribute being choosen by DerivedMesh at drawing time. For this reason, we declare all possible attrib "name" for each data layer inside the batches. In the glsl code, we declare required data by type and name. Then Gawain only bind vbos if names correspond. This is way cleaner as we do not need to access the CD itself when drawing. One other problem is that the hash maybe 11 caracters long and rapidly overload gawain's attrib name buffer.
2017-05-01Eevee: Change MAX2 to max_ffClément Foucault
2017-05-01Eevee: World nodetree gpumaterial compatibility.Clément Foucault
- Unify GPUMaterial creation (world/mesh). - Support for multiple shader variations (not used for now). - Convert GPUInputs to DRWUniforms to be used with the draw manager. - Nodetree Update is not supported. The only way to refresh the shaders is to change render engine. - Cleanup in GPUPass. - Add new temporary Node Compatibility type. Compatibility types should be removed in the future.
2017-05-01Getting rid of setlinestyle: FCurves drawing.Bastien Montagne
2017-05-01Getting rid of setlinestyle: last bit in NLA.Bastien Montagne
Note that smooth-shaded outlines of muted NLA strips should also be dashed, not sure how to do that currently (in a simple way), so kept them solid for now.
2017-05-01Fix for issue when duplicating text objectsDalai Felinto
The crash happens with Cycles and Font objects if we get Cycles working with draw manager.
2017-05-01Cleanup/followup to previous commit: get rid of dashed-specific helpers.Bastien Montagne
Those are no more needed.
2017-05-01Reworked version of dashed line shader.Bastien Montagne
Using geometry shader allows us to get rid of the 'line origin' extra vertex attribute, which means dashed shader no longer requires fiddling with those vertex attributes definition, and, most importantly, does not require anymore special drawing code! As you can see, this makes code much simpler, and much less verbose, especially in complex cases. In addition, changed how dashes are handled, to have two 'modes', a simple one with single color (using default "color" uniform name), and a more advanced one allowing more complex and multi-color patterns. Note that since GLSL 1.2 does not support geometry shaders, a hack was added for now (which gives solid lines, but at least does not make Blender crash).
2017-05-01WITH_CLAY_ENGINE: Should be used for CLAY only, not drawmanagerDalai Felinto
2017-05-01Draw Manager: Fix copy-paste harmless comment "typo"Dalai Felinto
2017-05-01Blender 2.8: Update arc configSergey Sharybin
2017-05-01Check we've got GLEW version 2 when building with core profileSergey Sharybin
There was a bug in older GLEW version which kept glGenVertexArrays as NULL when 3.2 core context is requested [1]. Didn't find a way to check GLEW version from CMake, it seems the version is not really exposed to the header. [1] https://sourceforge.net/p/glew/bugs/124/
2017-04-30fix typo in WITH_SYSTEM_GFLOG in CMakeLists.txtlazydodo
2017-04-29Getting rid of setlinestyle: sample line in Image space.Bastien Montagne
2017-04-29Getting rid of setlinestyle: UV editor drawing.Bastien Montagne
2017-04-29Getting rid of setlinestyle: remove gpencil's debug-only dashed line drawing.Bastien Montagne
No need to add extra complexity of conditional dashing here for now!
2017-04-29Getting rid of setlinestyle: ed_util's pos-to-mouse dashed line.Bastien Montagne
2017-04-29Getting rid of setlinestyle: GPencil eraser.Bastien Montagne
Note the ugly hack on number of segments for outline dashed circle, to get an OK-ish rendering of dashes...
2017-04-29Getting rid of setlinestyle: add imm_draw_circle_wire_dashed() util.Bastien Montagne
Needed a bit of twisting in generic private func behind the imm_draw_circle helpers, but think it's fine. Note that this demonstrate yet another downside of new dashed shader compared to olde line style: not only does it needs more complex setup, and can only work with PRIM_LINES type of primitives, but it also behaves totally wrong with chained short segments! We really need to find a better way to do this effect at some point. :(
2017-04-29Cleanup: comment blocksCampbell Barton
2017-04-29Merge branch 'master' into blender2.8Campbell Barton
2017-04-29Cleanup: comment blocksCampbell Barton
2017-04-29View3D: support both orbit select & depthCampbell Barton
When using both preferences, use cursor depth when nothings selected.
2017-04-29Curve Fitting: minor change to re-fitting methodCampbell Barton
Avoid calculating a new split-index when re-fitting. While checking if a knot can be removed, the index with the highest error can be used as a candidate to replace the knot (in the case it can't be removed).
2017-04-29Getting rid of setlinestyle: NLA (part I).Bastien Montagne
Also restore drawing of local action markers in NLA strips... Note: there is another usage of setlinestyle in this file, not sure how to hanlde it for now, so will leave it for later...
2017-04-29Getting rid of setlinestyle: Color ramp markers.Bastien Montagne
2017-04-29Getting rid of setlinestyle: Text space margin line.Bastien Montagne