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-06-13Merge branch 'master' into custom-normals-bmeshcustom-normals-bmeshBastien Montagne
2016-06-13Fix glShadeModel being left flat in edit-mode drawCampbell Barton
2016-06-13Cycles: Fix unhandled enumerator in OSL switchSergey Sharybin
Unsigned int is not supported by OSL as far as i concerned, so should not really matter here. However, might be wrong and perhaps more proper idea would be so set it as regular int?
2016-06-13Fix T48616: Auto-merge selects extra edgesCampbell Barton
Auto-merge caused all edges between selected vertices to be selected. This only makes sense in vertex-select-mode. Correct edge-flag merging code, which now merges flags from multiple edges.
2016-06-12Fix build error with GCC 6.1.Brecht Van Lommel
2016-06-12Fix Cycles debug build assert on some platforms, tighten checks to avoid ↵Brecht Van Lommel
this in the future.
2016-06-12Fix T48604: Crash on undo due to bad drawing code.Bastien Montagne
Short story: draw_lamp would add itself to delayed transp drawing list from 'xray' drawing step. This was broken, since delayed transp drawing list is always handled **before** delayed xray one. After undo it lead to segfault crash, v3d->afterdraw_transp still having reference to old freed scene's base. Also added asserts that those afterdraw list are empty at end of drawing step, should help avoiding that kind of issue in future.
2016-06-12Curve Fitting: offset based fallback to calculate cubicsCampbell Barton
Add a new fallback method that uses offset distance from the curve to the line between both points, for freehand drawing it typically only fives minor improvements (1-3% fewer points), for curve dissolve the improvements are more noticeable.
2016-06-12BLI_math: cleanup arg namesCampbell Barton
project functions arg naming made it hard to tell which vector was projected onto.
2016-06-12bmesh py api: expose BM_face_calc_tangent_*Campbell Barton
D1988 by @wisaac, with own edits and improvements. This improves on existing tangent calculation functions too. - BM_face_calc_tangent_auto: Chooses method based on number of sides, used by manipulator (not exposed to Python). - BM_face_calc_tangent_edge: from longest edge. - BM_face_calc_tangent_edge_pair: from longest edge-pair (most useful with quads). - BM_face_calc_tangent_edge_diagonal: edge farthest from any vertex. - BM_face_calc_tangent_vert_diagonal: vert farthest from any vertex. Also optimize BM_vert_tri_calc_tangent_edge* functions to avoid sqrt.
2016-06-12Docs: Support out-of-source reference-API buildsCampbell Barton
This was originally supported, however relative links to examples & templates made it fail. Now files in the source tree are copied to the build-dir, with ".." replaced with "__" to avoid having to mirror Blender's source-layout in the Sphinx build-dir. Also skip uploading the built docs when an SSH user-name isn't passed to sphinx_doc_gen.sh instead of aborting (so people w/o SSH access to our servers can use the shell-script).
2016-06-12Cleanup: API docs (whitespace/line length)Campbell Barton
2016-06-12Cleanup, remove unneeded variable.Thomas Dinges
2016-06-12Fix compiler warning for unused variables.Thomas Dinges
2016-06-12Cycles: make shader node enums consistently lower case, update OSL shaders ↵Brecht Van Lommel
accordingly.
2016-06-12Fix OS X build after Decklink changes, it is not supported yet so don't ↵Brecht Van Lommel
enable it.
2016-06-11BGE: DeckLink card support for video capture and streaming.Benoit Bolsee
You can capture and stream video in the BGE using the DeckLink video cards from Black Magic Design. You need a card and Desktop Video software version 10.4 or above to use these features in the BGE. Many thanks to Nuno Estanquiero who tested the patch extensively on a variety of Decklink products, it wouldn't have been possible without his help. You can find a brief summary of the decklink features here: https://wiki.blender.org/index.php/Dev:Source/GameEngine/Decklink The full API details and samples are in the Python API documentation. bge.texture.VideoDeckLink(format, capture=0): Use this object to capture a video stream. the format argument describes the video and pixel formats and the capture argument the card number. This object can be used as a source for bge.texture.Texture so that the frame is sent to the GPU, or by itself using the new refresh method to get the video frame in a buffer. The frames are usually not in RGB but in YUV format (8bit or 10bit); they require a shader to extract the RGB components in the GPU. Details and sample shaders in the documentation. 3D video capture is supported: the frames are double height with left and right eyes in top-bottom order. The 'eye' uniform (see setUniformEyef) can be used to sample the 3D frame when the BGE is also in stereo mode. This allows to composite a 3D video stream with a 3D scene and render it in stereo. In Windows, and if you have a nVidia Quadro GPU, you can benefit of an additional performance boost by using 'GPUDirect': a method to send a video frame to the GPU without going through the OGL driver. The 'pinned memory' OGL extension is also supported (only on high-end AMD GPU) with the same effect. bge.texture.DeckLink(cardIdx=0, format=""): Use this object to send video frame to a DeckLink card. Only the immediate mode is supported, the scheduled mode is not implemented. This object is similar to bge.texture.Texture: you need to attach a image source and call refresh() to compute and send the frame to the card. This object is best suited for video keying: a video stream (not captured) flows through the card and the frame you send to the card are displayed above it (the card does the compositing automatically based on the alpha channel). At the time of this commit, 3D video keying is supported in the BGE but not in the DeckLink card due to a color space issue.
2016-06-11BL_Shader.setUniformEyef(name)Benoit Bolsee
defines a uniform that reflects the eye being rendered in stereo mode: 0.0 for the left eye, 0.5 for the right eye. In non stereo mode, the value of the uniform is fixed to 0.0. The typical use of this uniform is in stereo mode to sample stereo textures containing the left and right eye images in a top-bottom order. python: shader = obj.meshes[0].materials[mat].getShader() shader.setUniformEyef("eye") shader: uniform float eye; uniform sampler2D tex; void main(void) { vec4 color; float ty, tx; tx = gl_TexCoord[0].x; ty = eye+gl_TexCoord[0].y*0.5; // ty will be between 0 and 0.5 for the left eye render // and 0.5 and 1.0 for the right eye render. color = texture(tex, vec2(tx, ty)); ... }
2016-06-11Atomic ops: Fix atomic_add_uint32 and atomic_sub_uint32 in WindowsBenoit Bolsee
The assembler version in Windows used to return the previous value of the variable while all the other versions return the new value. This is now fixed for consistency. Note: this bug had no effect on blender because no part of the code use the return value of these functions, but the future BGE DeckLink module makes use of it to implement reference counter.
2016-06-11BGE: Various render improvements.Benoit Bolsee
bge.logic.setRender(flag) to enable/disable render. The render pass is enabled by default but it can be disabled with bge.logic.setRender(False). Once disabled, the render pass is skipped and a new logic frame starts immediately. Note that VSync no longer limits the fps when render is off but the 'Use Frame Rate' option in the Render Properties still does. To run as many frames as possible, untick the option This function is useful when you don't need the default render, e.g. when doing offscreen render to an alternate device than the monitor. Note that without VSync, you must limit the frame rate by other means. fbo = bge.render.offScreenCreate(width,height,[,samples=0][,target=bge.render.RAS_OFS_RENDER_BUFFER]) Use this method to create an offscreen buffer of given size, with given MSAA samples and targetting either a render buffer (bge.render.RAS_OFS_RENDER_BUFFER) or a texture (bge.render.RAS_OFS_RENDER_TEXTURE). Use the former if you want to retrieve the frame buffer on the host and the latter if you want to pass the render to another context (texture are proper OGL object, render buffers aren't) The object created by this function can only be used as a parameter of the bge.texture.ImageRender() constructor to send the the render to the FBO rather than to the frame buffer. This is best suited when you want to create a render of specific size, or if you need an image with an alpha channel. bge.texture.<imagetype>.refresh(buffer=None, format="RGBA", ts=-1.0) Without arg, the refresh method of the image objects is pretty much a no-op, it simply invalidates the image so that on next texture refresh, the image will be recalculated. It is now possible to pass an optional buffer object to transfer the image (and recalculate it if it was invalid) to an external object. The object must implement the 'buffer protocol'. The image will be transfered as "RGBA" or "BGRA" pixels depending on format argument (only those 2 formats are supported) and ts is an optional timestamp in the image depends on it (e.g. VideoFFmpeg playing a video file). With this function you don't need anymore to link the image object to a Texture object to use: the image object is self-sufficient. bge.texture.ImageRender(scene, camera, fbo=None) Render to buffer is possible by passing a FBO object (see offScreenCreate). bge.texture.ImageRender.render() Allows asynchronous render: call this method to render the scene but without extracting the pixels yet. The function returns as soon as the render commands have been send to the GPU. The render will proceed asynchronously in the GPU while the host can perform other tasks. To complete the render, you can either call refresh() directly of refresh the texture to which this object is the source. Asynchronous render is useful to achieve optimal performance: call render() on frame N and refresh() on frame N+1 to give as much as time as possible to the GPU to render the frame while the game engine can perform other tasks. Support negative scale on camera. Camera scale was previously ignored in the BGE. It is now injected in the modelview matrix as a vertical or horizontal flip of the scene (respectively if scaleY<0 and scaleX<0). Note that the actual value of the scale is not used, only the sign. This allows to flip the image produced by ImageRender() without any performance degradation: the flip is integrated in the render itself. Optimized image transfer from ImageRender to buffer. Previously, images that were transferred to the host were always going through buffers in VideoTexture. It is now possible to transfer ImageRender images to external buffer without intermediate copy (i.e. directly from OGL to buffer) if the attributes of the ImageRender objects are set as follow: flip=False, alpha=True, scale=False, depth=False, zbuff=False. (if you need to flip the image, use camera negative scale)
2016-06-11Fix Gradient Texture and OSL after refactor.Thomas Dinges
2016-06-11Attempted fix for T48625: tablet button configured to right click not ↵Brecht Van Lommel
working on OS X.
2016-06-11Cycles: nodify shader nodesBrecht Van Lommel
Differential Revision: https://developer.blender.org/D2038
2016-06-11Fix T48617: VSE: Do not draw backdrop in Seq + Preview mode, only makes ↵Bastien Montagne
sense when no preview is available...
2016-06-11BLI_rand: add BLI_rng_get_char_nCampbell Barton
Use to fill an array of bytes to random values.
2016-06-11Fix T48634: Interpolation and distribution of Children Particles breaks.Bastien Montagne
Own stupid off-by-one regression in rB019ce363b01bba0afe1 and later...
2016-06-11UI Font: Fix bad kerning of Thai font.Bastien Montagne
Thai font is a complex script that assumes full featured unicode layout engine, while Blender only knows about basic kerning (offset of a char based on the previous one). So this commit edits Thai part of our i18n font to fix the very bad spacing of thai chars we had in Blender so far. Work done by Hồ Châu, many thanks!
2016-06-10VSE: select by group: add option to select by group on same channel only.Bastien Montagne
2016-06-10Install_deps: add '--no-build' option to prevent compiling anything.Bastien Montagne
2016-06-10GPU: use basic-shader for line-stippleCampbell Barton
2016-06-10Remove redundant GL attribute push/popCampbell Barton
Stipple isnt left on during object drawing
2016-06-10Fix GPU logical error changing stippleCampbell Barton
2016-06-10Cleanup: brace-placementCampbell Barton
2016-06-09BGE: alpha on frame buffer and precedence of MSAA over swap.Benoit Bolsee
A new option '-a' can be passed to the blenderplayer. It forces the framebuffer to have an alpha channel. This can be used in VideoTexture to return a image with alpha channel with ImageViewport (provided alpha is set to True on the ImageViewport object and that the background color alpha channel is 0, which is the default). Without the -a option, the frame buffer has no alpha channel and ImageViewport always returns an opaque image, no matter what. In Linux, the player window will be rendered transparently over the desktop. In Windows, the player window is still rendered opaque because transparency of the window is only possible using the 'compositing' functions of Windows. The code is there but not enabled (look for WIN32_COMPOSITING) because 1) it doesn't work so well 2) it requires a DLL that is only available on Vista and up. give precedence to AA over Swap copy: Certain GPU (intel) will not allow MSAA together with swap copy. Previously, swap copy had priority over MSAA: fewer AA samples would be chosen if it was the condition to get swap copy. This patch reverse the logic: swap copy will be abandonned if another swap method (undefined or exchange) will provide the number of AA samples requested. If no AA samples is requested, swap copy still has the priority of course.
2016-06-09GPU: only call glShadeModel when neededCampbell Barton
2016-06-09GPU: avoid multiple bind calls in GPU_draw_pbvh_buffersCampbell Barton
Also add utility functions: GPU_basic_shader_bind_enable/disable so we don't have to get the previous state every time and manipulate it
2016-06-09Flat shading for basic shaderAlexander Romanov
The purpose of the patch is to replace deprecated glShadeModel. To decrease glShadeModel calls I've set GL_SMOOTH by default Reviewers: merwin, brecht Reviewed By: brecht Subscribers: blueprintrandom, Evgeny_Rodygin, AlexKowel, yurikovelenov Differential Revision: https://developer.blender.org/D1958
2016-06-09Fix T48614: Blender from buildbot crash when Separate selection in this ↵Bastien Montagne
particular scene. Regression from recent rB2c5dc66d5effd4072f438afb, if last item of last chunk of a mempool was valid, it would not be returned by mempool iterator step, which would always return NULL in that case.
2016-06-09Minor docstring formatting editCampbell Barton
2016-06-09Use mathutils_array_parse instead of inline array parsingCampbell Barton
Also fixes decref bug when None was given.
2016-06-09More minor changes:Campbell Barton
- replace PyTuple_Pack with PyTuple_SET_ITEMS (avoids using varargs, and instead assign values directly). - rename nbr_val -> value_len (consistent with value, value_items).
2016-06-09Cleanup: whitespaceCampbell Barton
2016-06-09Use PySequence_Fast_ITEMS for direct accessCampbell Barton
2016-06-09Merge branch 'master' into custom-normals-bmeshBastien Montagne
2016-06-09Compilation error fix after recent cleanupSergey Sharybin
Please do not do cleanups in minimal configuration, doing that has been proven to only cause issues without solving anything meaningful ;)
2016-06-08Cleanup: GPU arg wrappingCampbell Barton
2016-06-08Cleanup: GPU headersCampbell Barton
2016-06-08GPU: avoid disabling basic-shader for lassoCampbell Barton
Replace glDrawPixels w/ glaDrawPixelsTex
2016-06-08Fix armature stick draw, unpack-alignment was set but never restoredCampbell Barton
Drawing a single stick bone set the alignment to 1, applying this setting to the rest of Blender.
2016-06-08glutil: add glaGetOneInt helperCampbell Barton