Blender Git Loki

Kaikki Blender Git kommitit.

Page: 4923 / 8462

April 10, 2015, 21:43 (GMT)
Merge branch 'asset-experiments' into asset-engine
April 10, 2015, 21:42 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenlib/intern/BLI_filelist.c
source/blender/imbuf/IMB_thumbs.h
source/blender/imbuf/intern/thumbs.c
April 10, 2015, 21:34 (GMT)
Workflow shader fixes:

* ID type for GPUWorkflow shaders gets refined correctly
* GPUWorkflow correctly linked to spaceview3d when loading file
* Correct Icons in Node editor
* Creating a node tree works (but it's empty)
April 10, 2015, 21:00 (GMT)
BGE DeckLink: small linux compilation fix.
April 10, 2015, 19:07 (GMT)
BGE VideoTexture: 3D support+performance boost on DeckLink.

ImageViewport will now skip the unnecessary RGBA32 filtering if the capture
is already in the RGBA format. This will be the case if alpha=True and no
filter is set. This saves a great deal of CPU.
Add swap attribute to DeckLink to skip pixel format conversion between
VideoTexture internal (RGBA) and DeckLink (BGRA). This is to test the
benefit of passing the image directly to the board without intermediate
copy => great boost of performance.
However, it will be necessary to change the VideoTexture internal pixel
format from RGBA to BGRA.

3D stream is now fully supported on DeckLink, the right eye image is
passed via a new 'right' attribute (name not definitive). To generate this
image one can simply put a second camera to figure the right eye and
capture its view with ImageRende.
April 10, 2015, 18:20 (GMT)
BGE : Fix T43800: getScreenVect()/getScreenPosition()/modelview_matrix returns incorrect results

The getScreenVect(), getScreenPosition() and modelview_matrixmethod returns an incorrect results if called after the camera has been translated on the same frame.
The model view matrix will be update only once per frame with Cam->SetModelviewMatrix in KX_KetsjiEngine::RenderFrame.
Using GetWorldToCamera as model view matrix to get an actual view matrix even if the camera is moved.

Reviewers: sergey, dfelinto, brita_, sybren, hg1, campbellbarton

Reviewed By: hg1, campbellbarton

Projects: #game_engine

Differential Revision: https://developer.blender.org/D1170
April 10, 2015, 18:20 (GMT)
Cycles: free mesh BVH after packing the scene BVH

The idea is to avoid having original BVH and BVH packed into scene BVH and hence
reduce memory footprint.

This change doesn't give any measurable differences on it's own, but together
with D1215 and D1217 it gives quite nice results.

Reviewers: campbellbarton, brecht, juicyfruit

Subscribers: eyecandy

Differential Revision: https://developer.blender.org/D1218
April 10, 2015, 18:19 (GMT)
Cycles: Synchronize images after building mesh BVH

This way memory overhead caused by the BVH building is not so visible and peak
memory usage will be reduced.

Implementing this idea is not so straightforward actually, because we need to
synchronize images used for true displacement before meshes. Detecting whether
image is used for true displacement is not so striaghtforward, so for now all
all displacement types will synchronize images used for them.

Such change brings memory usage from 4.1G to 4.0G with the 01_01_01_D scene
from gooseberry. With 01_01_01_G scene it's 7.6G vs. 6.8G (before and after
the patch).

Reviewers: campbellbarton, juicyfruit, brecht

Subscribers: eyecandy

Differential Revision: https://developer.blender.org/D1217
April 10, 2015, 17:35 (GMT)
Cycles: Fix compilation error on windows after recent logging changes
April 10, 2015, 15:56 (GMT)
Merge branch 'cycles_memory_experiments' into gooseberry

Conflicts:
intern/cycles/blender/blender_sync.h
April 10, 2015, 15:56 (GMT)
Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
April 10, 2015, 15:55 (GMT)
Cycles: Experiment with culling objects based on the camera frustum

The idea is to give artists a simplier way to control memory usage in such
scenes as grass fields by doing automatic object culling based on whether
they're visible in the frame or not.

This is controlled on per-object level. In order to use this option few
steps are required:

- Allow renderer to use camera culling (Performance panel of render settings)
- Set camera cull margin (measured in relative value to the render resolution)
- Enable Camera Cull for objects which are desired to be culled
(object culling option could be found in Option panel in object buttons).

Interface decisions are not final for sure and to be refined if this
option is considered good enough for production.

Reviewers: juicyfruit, brecht, campbellbarton

Subscribers: venomgfx, eyecandy

Differential Revision: https://developer.blender.org/D1230
April 10, 2015, 15:50 (GMT)
WIP new node type for workflow shaders
April 10, 2015, 15:08 (GMT)
Merge branch 'master' into wiggly-widgets
April 10, 2015, 15:08 (GMT)
Initial support for user defined Object Widgets

Adds a Panel to the Object Context in the Properties Editor, currently
only containing a Menu to Add widgets. The menu contains 4 items,
Translate, Rotate, Scale and Custom, whereby we currently only draw a
translate widget for all of them. So yes, basic drawing also works.

Important is, that this makes it possible for users to attach custom
widgets to Objects. (Only the manipulator for the selected object is
drawn).
April 10, 2015, 14:43 (GMT)
Disable strict flags for msvc
April 10, 2015, 14:38 (GMT)
Workflow shader data

Hook the struct to more places. Now there is a button
to choose a workflow instead of a draw type in the new viewport
(still needs to be somehow sorted according to object mode)
April 10, 2015, 14:10 (GMT)
Fix for debug-only crash when setting "Any" keymap input type

Another one of those assert crashes when passing values != than 1 and 0
(in this case the value is -1)

Notes from reviewer:
--------------------
These should really be enums. since valid values are KM_ANY,
KM_MOD_FIRST, KM_MOD_SECOND.

But can see at some point this was changed from an enum so... I guess
this is the only way.

Reviewers: campbellbarton

Differential Revision: https://developer.blender.org/D1227
April 10, 2015, 13:34 (GMT)
Thumbnails: Add translations to font preview.

Not much to say, this is pretty straightforward.
We just have to add current locale to thumbnails 'signature', so that
previews get re-generated when we change locale...

Tested with Japanese and French.

Btw, I do not really understand why using BLF in ImBuf is badlevel... :/
April 10, 2015, 13:34 (GMT)
BLF translation: fix BLF_lang_get(), add UI-agnostic BLF_translate/_do helpers.

BLF_lang_get() shall return 'default' Blender locale (en_US) when translations
are completely disabled!

Also, add BLF_translate() and BLF_translate_do() to allow translating some strings
outside of label/tip context, but still only when i18n global flag is enabled.
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021