| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
intern/cycles/kernel/svm/svm.h
|
|
3rd fix for silly exception conversion!
|
|
|
|
Conflicts:
source/blender/editors/object/object_ops.c
|
|
|
|
Enum's itemf callback can be called without context in some cases (UI, doc generation...).
Python's enum properties did not handle this at all - it's kind of odd this did not cause
more trouble and wasn't notice earlier... Probably dynamic enums using context are not
much used in py code.
Note about nodes: those are heavy users of dynamic enum with context. Now,
we expect `NodeCategory.poll()` and `NodeItem.poll()` to always be called with
a valid context (since when there is no context available, we can assume `poll()`
is always True). `NodeCategory.items()`, however, must accept NULL context, so if
you use custom `items` callable for your custom node categories, you may need
to update it (as was done here for builtin `node_group_items()`).
|
|
Conflicts:
source/blender/windowmanager/intern/wm_playanim.c
|
|
first/last vars missed some values.
D1309 by @NHA
|
|
Conflicts:
source/blender/windowmanager/intern/wm_playanim.c
|
|
Mistakes in button expressions were previously only printed to the console.
|
|
Conflicts:
build_files/scons/tools/Blender.py
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/interface/interface_handlers.c
|
|
also remove some API docs from example
|
|
This commit mainly:
* Exposes PreviewImage struct in RNA, including ways for user to set images data.
* Adds a new kind of PreviewImage, using a file path and IMB_thumb to get image.
* Adds a new kind of custom icon using PreviewImage, unrelated to ID previews system.
* Adds a python API (utils.previews) to allow python scripts to access those custom previews/icons.
Note that loading image from files' thumbnails is done when needed (deferred loading), not
when defining the custom preview/icon.
WARNING: for release addons who would want to use this, please keep it to a strict minimum, really needed level.
We do not want our UI to explode under hundreds of different flashy icons!
For more info, see also the release notes of Blender 2.75 (http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.75/Addons)
and the example/templates featured with Blender.
Patch by Campbell (ideasman42), Inês (brita) and Bastien (mont29).
Differential Revision: https://developer.blender.org/D1255
|
|
|
|
|
|
|
|
Conflicts:
source/blender/editors/object/object_shapekey.c
|
|
Access to the python binary distributed with Blender,
fallback to system python executable (matching Blender's version).
|
|
matching convention for fixed length api, eg: copy_v3_fl
|
|
Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c
|
|
|
|
Splitting edges could give duplicates.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Only used in ATIs and NVIDIAs. Used extensions are:
https://www.opengl.org/registry/specs/ATI/meminfo.txt
http://developer.download.nvidia.com/opengl/specs/
If you read the documentation, the numbers are not supposed to be exact
and also depend on the time when the call is made. The numbers can also
change quite quickly. It's only meant to give a rough measure of what is
going on.
|
|
|
|
Conflicts:
source/blender/editors/space_view3d/view3d_edit.c
|
|
D782 by Stanislav Blinov
|
|
|
|
|
|
Conflicts:
source/blender/blenloader/intern/versioning_270.c
|
|
add BM_***_count_is_over(), _count_is_equal()
Useful if we only want to know if the count is a smaller value.
|
|
Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c
|
|
|
|
|
|
All kudos to Campbell for the head-up and patch!
|
|
Conflicts:
source/blender/gpu/intern/gpu_buffers.c
|
|
This patch will fix the world GLSL (mist, background, ambient) update for the BGE.
Reviewers: moguri, brecht
Reviewed By: moguri, brecht
Subscribers: panzergame
Differential Revision: https://developer.blender.org/D151
|
|
|
|
|
|
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
|
|
|
|
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_sequencer/sequencer_draw.c
|
|
Make consistent with calc_edge_angle,
take an optional fallback arg for non-manifold edges
otherwise raise an exception.
|
|
|
|
This was mis-named, rename to `calc_edge_angle`
and allow a fallback value in the case when the vert doesn't have 2-edges.
|
