Blender Git Commits

Gooseberry: Fix someone's bad merge conflict resolve in BGE stubs

GP Smooth Brush: Affect endpoints by a reduced amount instead of not at all

Endpoints can't be handled normally, as they tend to easily "shrink",
reducing the length of the stroke. However, we still want some smoothing
to take place, as it looks odd without anything happening.

BGE: bge.texture API documentation enhancement

This patch attempts to improve and review the documentation of bge.texture, as requested in the [[ http://wiki.blender.org/index.php/Dev:2.5/Source/Development/Todo/GameEngine#Video_Texture | TODO list ]].

More specifically, it

- fixes the rst syntax, including titles of the examples bge.texture.py and bge.texture.1.py;

- adds, standardizes and reviews description of the API elements, particularly signatures, types, etc.

- adds SOURCE_* constants to the doc

- splits the doc into thematical parts (Video, Image, Texture, and Filter Classes, Functions, Constants).

Notes:

- The parameter "mode" of ImageBuff.plot has to be described better. Actually, the whole set of IMB_BLEND_* constants (from IMB_imbuf.h) should be exposed to Python. I'll do that in a future diff, and complete the doc at the same moment (adding those IMB_BLEND_* constants to the Constants part of this doc).

- The option of using webcams in VideoFFmpeg is still particularly not well documented. I am planning to make a proposal about fixing T18634 (and its corresponding TODO in the list) by integrating OpenCV in the BGE (and Blender?). The idea would then probably be to add a new class, f.ex. ImageWebcam, making this functionnality more specialized. So for now I don't think it is worth to document that part much.

This patch fixes T44284 too.

Reviewers: moguri, kupoman, campbellbarton, panzergame, lordloki

Reviewed By: panzergame, lordloki

Subscribers: hg1

Projects: #game_engine, #game_python, #documentation

Maniphest Tasks: T44284

Differential Revision: https://developer.blender.org/D1352

Merge branch 'master' into GPencil_Editing_Stage3

Code cleanup

* Remove all mention of the complicated way of implementing smoothing for now
* Disable debug print

GP Stroke Sculpting: Initial implementation of a "Smooth" Brush

This commit introduces a basic "smooth" brush tool for sculpting Grease Pencil
strokes (i.e. for getting rid of wobbles or kinks in the stroke). The current
implementation is still quite rough (with quite a few points noted about how it
could be better).

Usage Notes:
* It is highly recommended to have the "Use Falloff" option enabled. Doing so
allows you to have quite a bit more subtlety to how well you can control the
effects of this brush (i.e. this option can be used to prevent the brush from
"shrinking" the strokes too much, if you use the edge of the brush)

* A radius of 25 px, and strength = 0.5 are also good starting points


Implementation Notes:
* This currently only affects the stroke coordintes. Whether pressure values should
be handled by this brush (with/without an option to turn this on/off), or whether
it should be handled as a separate brush remains to be seen.

* This isn't exactly the most efficient implementation. It also suffers from the
fact that because its effects are applied from the first point in the stroke
to the last (and in a single pass), you can get unwanted accumulated smoothing
effects.

* Currently all points in the neighbourhood are given equal priority. We could
investigate different weighting schemes here.

* This is currently hardcoded to consider 2 points before and 2 points after the
current one. This could be improved by offering control over how many on either
side to consider...

GP Stroke Sculpting: Fix bug with falloff calculation

Falloff calculation was incorrect as it could produce invalid values if the
distance to a point exceeeded the radius of the brush, resulting in "large
negative values".

Merge branch 'master' into opensubdiv-modifier

Conflicts:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/makesrna/intern/rna_userdef.c

Merge branch 'master' into openvdb

Merge branch 'asset-experiments' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py

Merge branch 'master' into asset-experiments

Expose fewest more generic ID filtering options.

Full precise filtering remains possible in new 'Advanced filter' panel.

UI-fix (bad 'recusion level' value in RNA enum, 1 is only valid in library listing case).

Merge branch 'master' into asset-experiments

Merge branch 'master' into temp_display_optimization

Revert "Squashed commit of the asset-experiments branch."

This reverts commit 900d8e547350f615b5a079ff80b1244fd58148bb.

Squashed commit of the asset-experiments branch.

Merge branch 'master' into experimental-build

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenlib/BLI_ghash.h

Merge branch 'master' into gooseberry