Blender Git Loki

Rename dilate/erode rna property "type" to "mode" to avoid naming conflicts

remove frame limits for sequence strip creation. was causing errors importing some EDL's

BLI_assert uses printf so stdio.h should be included instead of relying on it to be included by other headers accidentally

Workaround for textured display with dynamic topology enabled

This will only make object display with proper shape in textured
view, but all materials and textures will be replaced with default
gray color. There's currently no better way to deal with textured
display when dynamic topology enabled because of all UV/tfaces are
clearing when enabling dynamic topology sculpt.

Anyway, better to display gray object with proper lighting in this
case rather than not update object's shape during sculpt.

Proper solution will be possible once CD layer will be preserved
by BMesh log.

device_network.cpp is completely elided when WITH_NETWORK is not defined, so do not include it in the build in that case

Merged changes in the trunk up to revision 53584.

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup

Removal of old code trying to detect trackpads.

This was causing error in previous commit "wheel only worked after using trackpad once".

Trackpad pans for UV/Image and MovieClip editors were inverse compared to all other editors.

New version of code to detect whether a wheel is involved, or a trackpad.

It was compiled with "deploy target 10.6" tested on macbook with 10.8.
More tests follow quick.

Added some python API examples for the new get/set callbacks in bpy.props.

style cleanup: also add checker for function brace placement.

Changes for opengl render to reflect new alpha premul pipeline
without hurting quick texture painting

- ED_view3d_draw_offscreen will now output buffer with
transparent alpha, if sky needed it should be alpha-undered
later.

- ED_view3d_draw_offscreen_imbuf now accepts alpha mode as an
argument which could be either R_ADDSKY or R_PREMULALPHA

- OpenGL render and sequencer's opengl preview will now reflect
scene's Alpha Mode

- Quick Edit will use OpenGL with transparent alpha mode

This patch adds support in bpy.props for getter/setter callback functions. We already have update callbacks, but generic get/set functions can come in handy in some cases where the functionality is too complex to use a single value.

The current C callback functions are too simple allow a straightforward implementation, in particular they don't receive the PropertyRNA pointer itself as an argument, which means the callback cannot directly access the PropertyRNA's py_data pointers which store the python function objects. For this reason a second runtime variant of these callbacks has been added. It is only used for runtime callbacks and not in makesrna, but otherwise works the same way.

Remove some uneeded/irrelevant "PROP_TRANSLATE".

This sub-type is actually *only* needed for the "text" property of UI rna api (maybe we should rename it to "PROP_PY_TRANSLATE", as it is anyway only 'active' during conversion from py string to RNA string property...). In fact, I think it should only be used in RNA func properties anyway, as it stores the translated string into the property, it should only be used with "one time" RNA stuff...

Remove usage of deprecated TEX_USEALPHA from GE code

Making a few tooltips more descriptive, in light of recent confusion over the
purpose of some of these features

* ClampTo Constraint, Target Object field: now mentions that it is for curve
objects only
* Dopesheet Editor Modes: now describe what data is editable in each mode. The
wording may be a bit clumsy here, but (apart from Mask Editor one, which I'm not
entirely sure about) should at least be technically correct

Add translation contexts for line, mute and clip

Bugfix: "Change Frame" operator for setting current frame by clicking/scrubbing
in a timeline view would show up search results in other editors (e.g. 3D View).

This only really works where there is a timeline view as:
1) The modal interactive stuff is built on the assumption that a suitable 2D
view mapping exists
2) The operator is not "registered" (i.e. no props display after usage, and
doesn't get shown in undo) as it's more "view state" than "scene data"

Rewrote poll callback to handlethis properly

Tsst... "faled"... :p

Adding some example for new UIList...