Blender Git Loki

Cycles / Cleanup:
* All references to old textures should now be finally removed.

Fixing a BGE bug where textures could get loaded into VRAM twice.

Cycles / Textures:
* Some code cleanup, removed old enums, which are not used anymore.
* Some renaming for consistency and to match new texture names.

Cycles / Code Cleanup:
* Removed a workaround for the NodeType enum, uses consecutive values now.

I could not find issues with CUDA, when compiling with Toolkit 4.2 (all sm kernels) and regression files rendered fine on my GPU with sm_21.

Merging r47612 through r47623 from trunk into soc-2011-tomato

Fixed issue with missed reconstruction error in clip editor header

Actually was causes by error in RNA bindings which lead to empty reconstruction
returned for cameraObject.reconstruction.

Make planar tracking much faster.

- This makes planar tracking around 2-3x or more faster than
before, by rearranging how the sampling is done.
Previously, the source patch was sampled repeatedly on
every optimizer iteration; this was done for
implementation speed, but was wasteful in computation.

- This also contains some additions to Ceres to help
deailing with mixed numeric / automatic differentation. In
particular, there is now a "Chain::Rule" operator that
facilitates calling a function that takes Jet arguments,
yet does numeric derivatives internally. This is used to
mix the numeric differentation of the images with the warp
parameters, passed as jets by Ceres to the warp functor.

There is also a new "JetOps" object for doing operations
on types which may or may not be jets, such as scaling
the derivative part only, or extracting the scalar part
of a jet.

The Ceres patches are aimed at upstream.

- A new function for sampling a patch is now part of the
track_region.h API; this will get used to make the preview
widget properly show what is getting tracked. Currently
the preview widget does not handle perspective tracks.

Known issues:

This patch introduces a bug such that the "Minimum
Correlation" flag does not work; if it is enabled, tracking
aborts immediately. The workaround for now is to disable the
correlation checking, and examine your tracks carefully. A
fix will get added shortly.

Fixed issue with non-updating frame in clip editor when toggling undistorted render while frame is grayscaled.

Also corrected some typos in movieclip.

Added a default case in switch to avoid paranoid compiler warnings.

Selecting track channel in tracking dopesheet would make track active,
just as it happens with curve view.

Added sorting by average reprojection error to motion tracking dopesheet.

Particle Info node for Cycles. This can be used to access particle information in material shaders for dupli objects. For now only the particle Age and individual Lifetime (in frames) are supported, more attributes can be added when needed.

The particle data is stored in a separate texture if any of the dupli objects uses particle info nodes in shaders. To map dupli objects onto particles the store an additional particle_index value, which is different from the simple dupli object index (only visible particles, also works for particle dupli groups mode).

Some simple use cases on the code.blender.org blog:
http://code.blender.org/index.php/2012/05/particle-info-node/

Update Bullet to version 2.80 (bullet svn revision 2537)

Remove Jamfiles and other unused files that stuck around during previous updates.

Add patches for local changes to the patches directory.

Update readme.txt, it had outdated infromation.

Don't show physics properties in game engine conext

Also rename fluid panels to be more consistent with other simulations

Fix #31752: Select All By Layer seems not to work when object belongs to several layers

Added option which changes match policy from exact match and shared layers when
selecting objects by layer.

svn merge ^/trunk/blender -r47603:47611

add listener in action space for mask changes so dopesheet redraws + other minor changes.

mask animation keys now editable in the dope sheet (duplicate, transform, delete, select- etc).

Index: source/blender/gpu/intern/gpu_draw.c
===================================================================
--- source/blender/gpu/intern/gpu_draw.c (revision 47568)
+++ source/blender/gpu/intern/gpu_draw.c (working copy)
@@ -230,11 +230,12 @@
Image *ima, *curima;

int domipmap, linearmipmap;
+ int texpaint; /* store this so that new images created while texture painting won't be set to mipmapped */

int alphablend;
float anisotropic;
MTFace *lasttface;
-} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, -1, 1.f, NULL};
+} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, 0, -1, 1.f, NULL};

/* Mipmap settings */

@@ -256,7 +257,7 @@

static int gpu_get_mipmap(void)
{
- return GTS.domipmap;
+ return GTS.domipmap && !GTS.texpaint;
}

static GLenum gpu_get_mipmap_filter(int mag)
@@ -730,6 +731,8 @@
if (!GTS.domipmap)
return;

+ GTS.texpaint = !mipmap;
+
if (mipmap) {
for (ima=G.main->image.first; ima; ima=ima->id.next) {
if (ima->bindcode) {

fix for bug in point slide using freed memory when auto-keying.