From f2e055f4a480e5f8cc143b6252cd6a5f6cea05c4 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Tue, 19 Jul 2011 01:41:45 +0000
Subject: [PATCH 01/28] bugfix: [#27348] blenderplayer showing a different
 viewport size in 2.57b I believe this bug was there since we (me) moved the
 game settings to scene->gm Since I was here I added support for x/y non
 square aspect pixels (i.e. anamorphic) we were already using it for
 videotexture so I don't know why we were not here.

Tested in OSX, but it should be working in all OSs.
---
 source/gameengine/Converter/BL_BlenderDataConversion.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index af114457663..7b9c5d4b4d6 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1976,8 +1976,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 			frame_type = RAS_FrameSettings::e_frame_scale;
 		}
 		
-		aspect_width = blenderscene->gm.xsch;
-		aspect_height = blenderscene->gm.ysch;
+		aspect_width = blenderscene->r.xsch*blenderscene->r.xasp;
+		aspect_height = blenderscene->r.ysch*blenderscene->r.yasp;
 	}
 	
 	RAS_FrameSettings frame_settings(

From d8e216833a278d85caece8407d6ea5fad1a10c11 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Tue, 19 Jul 2011 02:47:43 +0000
Subject: [PATCH 02/28] cleanup of scene->gamedata DNA

xsch and ysch were originally planed to replace the scene->r.xsch/r.ysch
however in blender/3dview we still need to use the r. values. Therefore we can't really run
from using those values even in bplayer. So removed the values in gamedata.

The way it's now, render values (xsch and ysch) are responsible for aspect ratio and gamedata xplay and yplay are responsible for the size of the window.
---
 source/blender/blenloader/intern/readfile.c | 2 --
 source/blender/makesdna/DNA_scene_types.h   | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ab30d92f03e..4ad99c02b2d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10281,8 +10281,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			sce->gm.attrib = sce->r.attrib;
 
 			//Stereo
-			sce->gm.xsch = sce->r.xsch;
-			sce->gm.ysch = sce->r.ysch;
 			sce->gm.stereomode = sce->r.stereomode;
 			/* reassigning stereomode NO_STEREO and DOME to a separeted flag*/
 			if (sce->gm.stereomode == 1){ //1 = STEREO_NOSTEREO
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f351a48b998..3c14dacf973 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -430,7 +430,8 @@ typedef struct GameData {
 	/*
 	 * Radius of the activity bubble, in Manhattan length. Objects
 	 * outside the box are activity-culled. */
-	float activityBoxRadius; //it's not being used ANYWHERE !!!!!!!!!!!!!!
+	float activityBoxRadius;
+
 	/*
 	 * bit 3: (gameengine): Activity culling is enabled.
 	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling
@@ -447,7 +448,8 @@ typedef struct GameData {
 
 	/* stereo/dome mode */
 	struct GameDome dome;
-	short stereoflag, stereomode, xsch, ysch; //xsch and ysch used for backwards compat.
+	short stereoflag, stereomode;
+	short pad2, pad3;
 	float eyeseparation, pad1;
 } GameData;
 

From f4b6d00926cb3ff847ac843a692ef858bccf769d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 19 Jul 2011 05:05:54 +0000
Subject: [PATCH 03/28] fix for bpy.path.abspath(), if a path was passed it
 would get the last directory cut off, broke copying images on export.

---
 release/scripts/modules/bpy/path.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index 5e95428f641..74d043f8a54 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -35,7 +35,7 @@ def abspath(path, start=None):
     :type start: string
     """
     if path.startswith("//"):
-        return _os.path.join(_os.path.dirname(_bpy.data.filepath if start is None else start), path[2:])
+        return _os.path.join(_os.path.dirname(_bpy.data.filepath) if start is None else start, path[2:])
 
     return path
 

From 4024b14b43c6409a319d80611bcf8b5e536bda1f Mon Sep 17 00:00:00 2001
From: Jeroen Bakker <j.bakker@atmind.nl>
Date: Tue, 19 Jul 2011 08:31:53 +0000
Subject: [PATCH 04/28] fix for [#28012] Mat ID messy with shader nodes

Issue was that the Shader tree execution changed the ShaderInput.
Changes are that the UI is updated that only the main material will have the pass_index this is displayed in the "render pipeline options" panel.
When the material is not a node material the pass_index will be shown at the "options" panel

To test enable nodes on the material
Add a new input material
change the pass_index of the material (render pipeline options)
Enable RenderPass material ID and use the compositor to read out the material pass

Jeroen
---
 release/scripts/startup/bl_ui/properties_material.py | 5 ++++-
 source/blender/nodes/intern/SHD_util.c               | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 45c15bd1ce6..2a52ae23782 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -174,6 +174,7 @@ class MATERIAL_PT_pipeline(MaterialButtonsPanel, bpy.types.Panel):
         row.prop(mat, "use_transparency")
         sub = row.column()
         sub.prop(mat, "offset_z")
+
         sub.active = mat_type and mat.use_transparency and mat.transparency_method == 'Z_TRANSPARENCY'
 
         row = layout.row()
@@ -199,6 +200,7 @@ class MATERIAL_PT_pipeline(MaterialButtonsPanel, bpy.types.Panel):
         col.prop(mat, "shadow_cast_alpha", text="Casting Alpha")
         col.prop(mat, "use_cast_buffer_shadows")
         col.prop(mat, "use_cast_approximate")
+        col.prop(mat, "pass_index")
 
 
 class MATERIAL_PT_diffuse(MaterialButtonsPanel, bpy.types.Panel):
@@ -729,7 +731,8 @@ class MATERIAL_PT_options(MaterialButtonsPanel, bpy.types.Panel):
         col.prop(mat, "use_vertex_color_paint")
         col.prop(mat, "use_vertex_color_light")
         col.prop(mat, "use_object_color")
-        col.prop(mat, "pass_index")
+        if simple_material(base_mat):
+            col.prop(mat, "pass_index")
 
 
 class MATERIAL_PT_shadow(MaterialButtonsPanel, bpy.types.Panel):
diff --git a/source/blender/nodes/intern/SHD_util.c b/source/blender/nodes/intern/SHD_util.c
index cf7c64c9d5e..190f68ce19a 100644
--- a/source/blender/nodes/intern/SHD_util.c
+++ b/source/blender/nodes/intern/SHD_util.c
@@ -83,7 +83,11 @@ void nodestack_get_vec(float *in, short type_in, bNodeStack *ns)
 void ntreeShaderExecTree(bNodeTree *ntree, ShadeInput *shi, ShadeResult *shr)
 {
 	ShaderCallData scd;
-	
+	/*
+	 @note: preserve material from ShadeInput for material id, nodetree execs change it
+	 fix for bug "[#28012] Mat ID messy with shader nodes"
+	 */
+	Material *mat = shi->mat;
 	/* convert caller data to struct */
 	scd.shi= shi;
 	scd.shr= shr;
@@ -92,7 +96,8 @@ void ntreeShaderExecTree(bNodeTree *ntree, ShadeInput *shi, ShadeResult *shr)
 	memset(shr, 0, sizeof(ShadeResult));
 		   
 	ntreeExecTree(ntree, &scd, shi->thread);	/* threads */
-	
+	// @note: set material back to preserved material
+	shi->mat = mat;
 	/* better not allow negative for now */
 	if(shr->combined[0]<0.0f) shr->combined[0]= 0.0f;
 	if(shr->combined[1]<0.0f) shr->combined[1]= 0.0f;

From c7d8d289396e969b8a58e87d1dbcac7d81ddba0c Mon Sep 17 00:00:00 2001
From: Daniel Salazar <zanqdo@gmail.com>
Date: Tue, 19 Jul 2011 13:27:05 +0000
Subject: [PATCH 05/28] Object Align operator now correctly computes a *global*
 bounding box for all objects. This makes rotated or scaled objects work like
 they should. Now it's still derived from object's bounding box so it will not
 be completly acurate on complex objects.. to solve this Id need to cycle over
 all verts. Don't think that's a good idea to do in py

---
 .../startup/bl_operators/object_align.py      | 128 ++++++++++++------
 1 file changed, 85 insertions(+), 43 deletions(-)

diff --git a/release/scripts/startup/bl_operators/object_align.py b/release/scripts/startup/bl_operators/object_align.py
index 3202a717001..8bf5cc9e8fb 100644
--- a/release/scripts/startup/bl_operators/object_align.py
+++ b/release/scripts/startup/bl_operators/object_align.py
@@ -21,13 +21,52 @@
 import bpy
 from mathutils import Vector
 
+def GlobalBB(bb_world):
+    # Initialize the variables with the 8th vertex
+    left, right, front, back, down, up =\
+    bb_world[7][0],\
+    bb_world[7][0],\
+    bb_world[7][1],\
+    bb_world[7][1],\
+    bb_world[7][2],\
+    bb_world[7][2]
+    
+    # Test against the other 7 verts
+    for i in range (7):
+        
+        # X Range
+        val = bb_world[i][0]
+        if val < left:
+            left = val
+            
+        if val > right:
+            right = val
+            
+        # Y Range
+        val = bb_world[i][1]
+        if val < front:
+            front = val
+            
+        if val > back:
+            back = val
+            
+        # Z Range
+        val = bb_world[i][2]
+        if val < down:
+            down = val
+            
+        if val > up:
+            up = val
+            
+    return (Vector((left, front, up)), Vector((right, back, down)))
+
 
 def align_objects(align_x, align_y, align_z, align_mode, relative_to):
 
     cursor = bpy.context.scene.cursor_location
 
-    Left_Up_Front_SEL = [0.0, 0.0, 0.0]
-    Right_Down_Back_SEL = [0.0, 0.0, 0.0]
+    Left_Front_Up_SEL = [0.0, 0.0, 0.0]
+    Right_Back_Down_SEL = [0.0, 0.0, 0.0]
 
     flag_first = True
 
@@ -42,78 +81,81 @@ def align_objects(align_x, align_y, align_z, align_mode, relative_to):
         return False
 
     for obj, bb_world in objs:
-        Left_Up_Front = bb_world[1]
-        Right_Down_Back = bb_world[7]
+        
+        GBB = GlobalBB(bb_world)
+        Left_Front_Up = GBB[0]
+        Right_Back_Down = GBB[1]
 
         # Active Center
 
         if obj == bpy.context.active_object:
 
-            center_active_x = (Left_Up_Front[0] + Right_Down_Back[0]) / 2.0
-            center_active_y = (Left_Up_Front[1] + Right_Down_Back[1]) / 2.0
-            center_active_z = (Left_Up_Front[2] + Right_Down_Back[2]) / 2.0
+            center_active_x = (Left_Front_Up[0] + Right_Back_Down[0]) / 2.0
+            center_active_y = (Left_Front_Up[1] + Right_Back_Down[1]) / 2.0
+            center_active_z = (Left_Front_Up[2] + Right_Back_Down[2]) / 2.0
 
-            size_active_x = (Right_Down_Back[0] - Left_Up_Front[0]) / 2.0
-            size_active_y = (Right_Down_Back[1] - Left_Up_Front[1]) / 2.0
-            size_active_z = (Left_Up_Front[2] - Right_Down_Back[2]) / 2.0
+            size_active_x = (Right_Back_Down[0] - Left_Front_Up[0]) / 2.0
+            size_active_y = (Right_Back_Down[1] - Left_Front_Up[1]) / 2.0
+            size_active_z = (Left_Front_Up[2] - Right_Back_Down[2]) / 2.0
 
         # Selection Center
 
         if flag_first:
             flag_first = False
 
-            Left_Up_Front_SEL[0] = Left_Up_Front[0]
-            Left_Up_Front_SEL[1] = Left_Up_Front[1]
-            Left_Up_Front_SEL[2] = Left_Up_Front[2]
+            Left_Front_Up_SEL[0] = Left_Front_Up[0]
+            Left_Front_Up_SEL[1] = Left_Front_Up[1]
+            Left_Front_Up_SEL[2] = Left_Front_Up[2]
 
-            Right_Down_Back_SEL[0] = Right_Down_Back[0]
-            Right_Down_Back_SEL[1] = Right_Down_Back[1]
-            Right_Down_Back_SEL[2] = Right_Down_Back[2]
+            Right_Back_Down_SEL[0] = Right_Back_Down[0]
+            Right_Back_Down_SEL[1] = Right_Back_Down[1]
+            Right_Back_Down_SEL[2] = Right_Back_Down[2]
 
         else:
             # X axis
-            if Left_Up_Front[0] < Left_Up_Front_SEL[0]:
-                Left_Up_Front_SEL[0] = Left_Up_Front[0]
+            if Left_Front_Up[0] < Left_Front_Up_SEL[0]:
+                Left_Front_Up_SEL[0] = Left_Front_Up[0]
             # Y axis
-            if Left_Up_Front[1] < Left_Up_Front_SEL[1]:
-                Left_Up_Front_SEL[1] = Left_Up_Front[1]
+            if Left_Front_Up[1] < Left_Front_Up_SEL[1]:
+                Left_Front_Up_SEL[1] = Left_Front_Up[1]
             # Z axis
-            if Left_Up_Front[2] > Left_Up_Front_SEL[2]:
-                Left_Up_Front_SEL[2] = Left_Up_Front[2]
+            if Left_Front_Up[2] > Left_Front_Up_SEL[2]:
+                Left_Front_Up_SEL[2] = Left_Front_Up[2]
 
             # X axis
-            if Right_Down_Back[0] > Right_Down_Back_SEL[0]:
-                Right_Down_Back_SEL[0] = Right_Down_Back[0]
+            if Right_Back_Down[0] > Right_Back_Down_SEL[0]:
+                Right_Back_Down_SEL[0] = Right_Back_Down[0]
             # Y axis
-            if Right_Down_Back[1] > Right_Down_Back_SEL[1]:
-                Right_Down_Back_SEL[1] = Right_Down_Back[1]
+            if Right_Back_Down[1] > Right_Back_Down_SEL[1]:
+                Right_Back_Down_SEL[1] = Right_Back_Down[1]
             # Z axis
-            if Right_Down_Back[2] < Right_Down_Back_SEL[2]:
-                Right_Down_Back_SEL[2] = Right_Down_Back[2]
+            if Right_Back_Down[2] < Right_Back_Down_SEL[2]:
+                Right_Back_Down_SEL[2] = Right_Back_Down[2]
 
-    center_sel_x = (Left_Up_Front_SEL[0] + Right_Down_Back_SEL[0]) / 2.0
-    center_sel_y = (Left_Up_Front_SEL[1] + Right_Down_Back_SEL[1]) / 2.0
-    center_sel_z = (Left_Up_Front_SEL[2] + Right_Down_Back_SEL[2]) / 2.0
+    center_sel_x = (Left_Front_Up_SEL[0] + Right_Back_Down_SEL[0]) / 2.0
+    center_sel_y = (Left_Front_Up_SEL[1] + Right_Back_Down_SEL[1]) / 2.0
+    center_sel_z = (Left_Front_Up_SEL[2] + Right_Back_Down_SEL[2]) / 2.0
 
     # Main Loop
 
     for obj, bb_world in objs:
         bb_world = [Vector(v[:]) * obj.matrix_world for v in obj.bound_box]
+        
+        GBB = GlobalBB(bb_world)
+        Left_Front_Up = GBB[0]
+        Right_Back_Down = GBB[1]
 
-        Left_Up_Front = bb_world[1]
-        Right_Down_Back = bb_world[7]
+        center_x = (Left_Front_Up[0] + Right_Back_Down[0]) / 2.0
+        center_y = (Left_Front_Up[1] + Right_Back_Down[1]) / 2.0
+        center_z = (Left_Front_Up[2] + Right_Back_Down[2]) / 2.0
 
-        center_x = (Left_Up_Front[0] + Right_Down_Back[0]) / 2.0
-        center_y = (Left_Up_Front[1] + Right_Down_Back[1]) / 2.0
-        center_z = (Left_Up_Front[2] + Right_Down_Back[2]) / 2.0
+        positive_x = Right_Back_Down[0]
+        positive_y = Right_Back_Down[1]
+        positive_z = Left_Front_Up[2]
 
-        positive_x = Right_Down_Back[0]
-        positive_y = Right_Down_Back[1]
-        positive_z = Left_Up_Front[2]
-
-        negative_x = Left_Up_Front[0]
-        negative_y = Left_Up_Front[1]
-        negative_z = Right_Down_Back[2]
+        negative_x = Left_Front_Up[0]
+        negative_y = Left_Front_Up[1]
+        negative_z = Right_Back_Down[2]
 
         obj_loc = obj.location
 

From 1191c1ead90928485f90faa201c296e857ffd050 Mon Sep 17 00:00:00 2001
From: Daniel Salazar <zanqdo@gmail.com>
Date: Tue, 19 Jul 2011 15:07:29 +0000
Subject: [PATCH 06/28] Object Align operator: coudn't resist and added a high
 quality (slower) option to get perfect alighment on complex shapes with
 rotation/scaling :D

sexy example:
http://www.pasteall.org/pic/show.php?id=15171
---
 .../startup/bl_operators/object_align.py      | 75 +++++++++++++++++--
 1 file changed, 68 insertions(+), 7 deletions(-)

diff --git a/release/scripts/startup/bl_operators/object_align.py b/release/scripts/startup/bl_operators/object_align.py
index 8bf5cc9e8fb..aefc12ed8df 100644
--- a/release/scripts/startup/bl_operators/object_align.py
+++ b/release/scripts/startup/bl_operators/object_align.py
@@ -21,7 +21,8 @@
 import bpy
 from mathutils import Vector
 
-def GlobalBB(bb_world):
+def GlobalBB_LQ(bb_world):
+    
     # Initialize the variables with the 8th vertex
     left, right, front, back, down, up =\
     bb_world[7][0],\
@@ -57,11 +58,58 @@ def GlobalBB(bb_world):
             
         if val > up:
             up = val
+        
+    return (Vector((left, front, up)), Vector((right, back, down)))
+
+def GlobalBB_HQ(obj):
+    
+    # Initialize the variables with the last vertex
+    
+    verts = obj.data.vertices
+    
+    val = verts[-1].co * obj.matrix_world
+    
+    left, right, front, back, down, up =\
+    val[0],\
+    val[0],\
+    val[1],\
+    val[1],\
+    val[2],\
+    val[2]
+    
+    # Test against all other verts
+    for i in range (len(verts)-1):
+        
+        vco = verts[i].co * obj.matrix_world
+        
+        # X Range
+        val = vco[0]
+        if val < left:
+            left = val
             
+        if val > right:
+            right = val
+            
+        # Y Range
+        val = vco[1]
+        if val < front:
+            front = val
+            
+        if val > back:
+            back = val
+            
+        # Z Range
+        val = vco[2]
+        if val < down:
+            down = val
+            
+        if val > up:
+            up = val
+        
     return (Vector((left, front, up)), Vector((right, back, down)))
 
 
-def align_objects(align_x, align_y, align_z, align_mode, relative_to):
+def align_objects(align_x, align_y, align_z, align_mode, relative_to, bb_quality):
 
     cursor = bpy.context.scene.cursor_location
 
@@ -82,7 +130,11 @@ def align_objects(align_x, align_y, align_z, align_mode, relative_to):
 
     for obj, bb_world in objs:
         
-        GBB = GlobalBB(bb_world)
+        if bb_quality:
+            GBB = GlobalBB_HQ(obj)
+        else:
+            GBB = GlobalBB_LQ(bb_world)
+            
         Left_Front_Up = GBB[0]
         Right_Back_Down = GBB[1]
 
@@ -141,7 +193,11 @@ def align_objects(align_x, align_y, align_z, align_mode, relative_to):
     for obj, bb_world in objs:
         bb_world = [Vector(v[:]) * obj.matrix_world for v in obj.bound_box]
         
-        GBB = GlobalBB(bb_world)
+        if bb_quality:
+            GBB = GlobalBB_HQ(obj)
+        else:
+            GBB = GlobalBB_LQ(bb_world)
+            
         Left_Front_Up = GBB[0]
         Right_Back_Down = GBB[1]
 
@@ -270,7 +326,7 @@ def align_objects(align_x, align_y, align_z, align_mode, relative_to):
     return True
 
 
-from bpy.props import EnumProperty
+from bpy.props import EnumProperty, BoolProperty
 
 
 class AlignObjects(bpy.types.Operator):
@@ -279,6 +335,11 @@ class AlignObjects(bpy.types.Operator):
     bl_label = "Align Objects"
     bl_options = {'REGISTER', 'UNDO'}
 
+    bb_quality = BoolProperty(
+            name="High Quality",
+            description="Enables high quality calculation of the bounding box for perfect results on complex shape meshes with rotation/scale (Slow)",
+            default=False)
+
     align_mode = EnumProperty(items=(
             ('OPT_1', "Negative Sides", ""),
             ('OPT_2', "Centers", ""),
@@ -311,10 +372,10 @@ class AlignObjects(bpy.types.Operator):
 
     def execute(self, context):
         align_axis = self.align_axis
-        ret = align_objects('X' in align_axis, 'Y' in align_axis, 'Z' in align_axis, self.align_mode, self.relative_to)
+        ret = align_objects('X' in align_axis, 'Y' in align_axis, 'Z' in align_axis, self.align_mode, self.relative_to, self.bb_quality)
 
         if not ret:
             self.report({'WARNING'}, "No objects with bound-box selected")
             return {'CANCELLED'}
         else:
-            return {'FINISHED'}
+            return {'FINISHED'}
\ No newline at end of file

From 0936874695d981a987488b19f02dfe363ec68c0e Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 19 Jul 2011 15:21:21 +0000
Subject: [PATCH 07/28] update to patch from Andrew Hale -
 obj.closest_point_ob_mesh() now takes an optional max_dist argument.

---
 source/blender/makesrna/intern/rna_object_api.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index b33935b7bed..9018fd8c71a 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -45,6 +45,8 @@
 
 // #include "ED_mesh.h"
 
+#include "BLI_math.h"
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_main.h"
@@ -64,8 +66,6 @@
 #include "BKE_mball.h"
 #include "BKE_modifier.h"
 
-#include "BLI_math.h"
-
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_meshdata_types.h"
@@ -415,7 +415,7 @@ void rna_Object_ray_cast(Object *ob, ReportList *reports, float ray_start[3], fl
 	*index= -1;
 }
 
-void rna_Object_closest_point_on_mesh(Object *ob, ReportList *reports, float point_co[3], float n_location[3], float n_normal[3], int *index)
+void rna_Object_closest_point_on_mesh(Object *ob, ReportList *reports, float point_co[3], float max_dist, float n_location[3], float n_normal[3], int *index)
 {
 	BVHTreeFromMesh treeData= {NULL};
 	
@@ -435,7 +435,7 @@ void rna_Object_closest_point_on_mesh(Object *ob, ReportList *reports, float poi
 		BVHTreeNearest nearest;
 
 		nearest.index = -1;
-		nearest.dist = FLT_MAX;
+		nearest.dist = max_dist * max_dist;
 
 		if(BLI_bvhtree_find_nearest(treeData.tree, point_co, &nearest, treeData.nearest_callback, &treeData) != -1) {
 			copy_v3_v3(n_location, nearest.co);
@@ -541,9 +541,10 @@ void RNA_api_object(StructRNA *srna)
 	RNA_def_function_ui_description(func, "Find the nearest point on the object.");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 
-	/* ray start and end */
+	/* location of point for test and max distance */
 	parm= RNA_def_float_vector(func, "point", 3, NULL, -FLT_MAX, FLT_MAX, "", "", -1e4, 1e4);
 	RNA_def_property_flag(parm, PROP_REQUIRED);
+	parm= RNA_def_float(func, "max_dist", sqrt(FLT_MAX), 0.0, FLT_MAX, "", "", 0.0, FLT_MAX);
 
 	/* return location and normal */
 	parm= RNA_def_float_vector(func, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "The location on the object closest to the point", -1e4, 1e4);
@@ -553,7 +554,7 @@ void RNA_api_object(StructRNA *srna)
 	RNA_def_property_flag(parm, PROP_THICK_WRAP);
 	RNA_def_function_output(func, parm);
 
-	parm= RNA_def_int(func, "index", 0, 0, 0, "", "The face index, -1 when no intersection is found.", 0, 0);
+	parm= RNA_def_int(func, "index", 0, 0, 0, "", "The face index, -1 when no closest point is found.", 0, 0);
 	RNA_def_function_output(func, parm);
 
 	/* View */

From fd7825e7dce2803c7864303d5346027d60d212ee Mon Sep 17 00:00:00 2001
From: Daniel Salazar <zanqdo@gmail.com>
Date: Tue, 19 Jul 2011 15:30:19 +0000
Subject: [PATCH 08/28] Speedup, do only one global matrix grab per obj

---
 release/scripts/startup/bl_operators/object_align.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/release/scripts/startup/bl_operators/object_align.py b/release/scripts/startup/bl_operators/object_align.py
index aefc12ed8df..d215f3476cf 100644
--- a/release/scripts/startup/bl_operators/object_align.py
+++ b/release/scripts/startup/bl_operators/object_align.py
@@ -63,11 +63,13 @@ def GlobalBB_LQ(bb_world):
 
 def GlobalBB_HQ(obj):
     
+    matrix_world = obj.matrix_world.copy()
+    
     # Initialize the variables with the last vertex
     
     verts = obj.data.vertices
     
-    val = verts[-1].co * obj.matrix_world
+    val = verts[-1].co * matrix_world
     
     left, right, front, back, down, up =\
     val[0],\
@@ -80,7 +82,7 @@ def GlobalBB_HQ(obj):
     # Test against all other verts
     for i in range (len(verts)-1):
         
-        vco = verts[i].co * obj.matrix_world
+        vco = verts[i].co * matrix_world
         
         # X Range
         val = vco[0]

From 0ed523a8dd66189bbef192ad37d90c9c462d5dc1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 20 Jul 2011 05:57:38 +0000
Subject: [PATCH 09/28] patch [#28032] Python Mathutils: Matrix Multiplication
 Error from Scott Giese (sgiese)

---
 .../blender/python/mathutils/mathutils_Matrix.c  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index b0187c1ef25..39d0784b287 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -1594,20 +1594,14 @@ static PyObject *Matrix_mul(PyObject *m1, PyObject *m2)
 			return NULL;
 		}
 		else {
-			float mat[16]= {0.0f, 0.0f, 0.0f, 0.0f,
-							0.0f, 0.0f, 0.0f, 0.0f,
-							0.0f, 0.0f, 0.0f, 0.0f,
-							0.0f, 0.0f, 0.0f, 1.0f};
-			double dot = 0.0f;
+			float mat[16]= {0.0f};
 			int x, y, z;
 
-			for(x = 0; x < mat2->row_size; x++) {
-				for(y = 0; y < mat1->col_size; y++) {
-					for(z = 0; z < mat1->row_size; z++) {
-						dot += (mat1->matrix[z][y] * mat2->matrix[x][z]);
+			for(x = 0; x < mat1->row_size; x++) {
+				for(y = 0; y < mat2->col_size; y++) {
+					for(z = 0; z < mat2->row_size; z++) {
+						mat[x * mat1->col_size + y] += (mat1->matrix[x][z] * mat2->matrix[z][y]);
 					}
-					mat[((x * mat1->col_size) + y)] = (float)dot;
-					dot = 0.0f;
 				}
 			}
 

From 74219d2704dfcc77c8530be47a626287ec1423a9 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 20 Jul 2011 06:05:47 +0000
Subject: [PATCH 10/28] patch [#28031] Minor typo in Blenlib from Scott Giese
 (sgiese)

---
 GNUmakefile                               | 4 ++--
 source/blender/blenlib/intern/path_util.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index d1a60ce5e37..b6741d7e5f0 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -73,7 +73,7 @@ all:
 
 	@echo
 	@echo Building Blender ...
-	make -C $(BUILD_DIR) -s -j $(NPROCS) install
+	$(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
 	@echo
 	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
 	@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
@@ -112,6 +112,6 @@ test_deprecated:
 	python3 source/tests/check_deprecated.py
 
 clean:
-	make -C $(BUILD_DIR) clean
+	$(MAKE) -C $(BUILD_DIR) clean
 
 .PHONY: all
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 80b85661762..f89283178ec 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1680,7 +1680,7 @@ void BLI_where_am_i(char *fullname, const size_t maxlen, const char *name)
 	if(GetModuleFileName(0, fullname, maxlen)) {
 		if(!BLI_exists(fullname)) {
 			printf("path can't be found: \"%.*s\"\n", maxlen, fullname);
-			MessageBox(NULL, "path constains invalid characters or is too long (see console)", "Error", MB_OK);
+			MessageBox(NULL, "path contains invalid characters or is too long (see console)", "Error", MB_OK);
 		}
 		return;
 	}

From 60ae40a0ed320cef275c2fd05eed97bd125d9a6e Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 20 Jul 2011 06:22:16 +0000
Subject: [PATCH 11/28] patch [#28030] SCONS Build: Build Date reflects "1"
 instead of actual date of build by Scott Giese (sgiese)

This bug effected windows and linux.
---
 build_files/scons/tools/Blender.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index d8f5ba9e115..75af7e47edd 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -320,11 +320,7 @@ def creator(env):
         defs.append('WITH_PYTHON')
         if env['BF_DEBUG']:
             defs.append('_DEBUG')
-        
-    if env['BF_BUILDINFO']:
-        defs.append('BUILD_DATE')
-        defs.append('NAN_BUILDINFO')
-        
+
     if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
         incs.append(env['BF_PTHREADS_INC'])
 

From 8b5e7f26501ba1794ad4e556fae169b2ca3c8769 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 20 Jul 2011 06:41:51 +0000
Subject: [PATCH 12/28] patch [#28032] swapped matrix multiplication order,
 reverse it back, tested with FBX, BVH import/export which are very sensitive
 to changes in matrix rotation.

---
 source/blender/python/mathutils/mathutils_Matrix.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index 39d0784b287..a7ed63776a5 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -1587,7 +1587,7 @@ static PyObject *Matrix_mul(PyObject *m1, PyObject *m2)
 
 	if(mat1 && mat2) {
 		/*MATRIX * MATRIX*/
-		if(mat1->row_size != mat2->col_size){
+		if(mat2->row_size != mat1->col_size){
 			PyErr_SetString(PyExc_ValueError,
 			                "Matrix multiplication: "
 			                "matrix A rowsize must equal matrix B colsize");
@@ -1597,15 +1597,15 @@ static PyObject *Matrix_mul(PyObject *m1, PyObject *m2)
 			float mat[16]= {0.0f};
 			int x, y, z;
 
-			for(x = 0; x < mat1->row_size; x++) {
-				for(y = 0; y < mat2->col_size; y++) {
-					for(z = 0; z < mat2->row_size; z++) {
-						mat[x * mat1->col_size + y] += (mat1->matrix[x][z] * mat2->matrix[z][y]);
+			for(x = 0; x < mat2->row_size; x++) {
+				for(y = 0; y < mat1->col_size; y++) {
+					for(z = 0; z < mat1->row_size; z++) {
+						mat[x * mat2->col_size + y] += (mat2->matrix[x][z] * mat1->matrix[z][y]);
 					}
 				}
 			}
 
-			return newMatrixObject(mat, mat2->row_size, mat1->col_size, Py_NEW, Py_TYPE(mat1));
+			return newMatrixObject(mat, mat1->row_size, mat2->col_size, Py_NEW, Py_TYPE(mat1));
 		}
 	}
 	else if(mat2) {

From 4ad43aaf16951ff3b916497509b1499734f38d0b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 20 Jul 2011 08:10:01 +0000
Subject: [PATCH 13/28] added bpy.path.basename because "//" prefix breaks
 os.path.basename.

---
 release/scripts/modules/bpy/path.py               | 11 ++++++++++-
 release/scripts/modules/bpy_extras/image_utils.py |  6 ++++--
 release/scripts/startup/bl_operators/image.py     |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index 74d043f8a54..f6254efac2e 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -117,7 +117,7 @@ def display_name_from_filepath(name):
     """
     Returns the path stripped of directort and extension, ensured to be utf8 compatible.
     """
-    return _os.path.splitext(_os.path.basename(name))[0].encode("utf8", "replace").decode("utf8")
+    return _os.path.splitext(basename(name))[0].encode("utf8", "replace").decode("utf8")
 
 
 def resolve_ncase(path):
@@ -231,3 +231,12 @@ def module_names(path, recursive=False):
                         modules.append(("%s.%s" % (filename, mod_name), mod_path))
 
     return modules
+
+
+def basename(path):
+    """
+    Equivalent to os.path.basename, but skips a "//" suffix.
+
+    Use for Windows compatibility.
+    """
+    return _os.path.basename(path[2:] if path.startswith("//") else path)
diff --git a/release/scripts/modules/bpy_extras/image_utils.py b/release/scripts/modules/bpy_extras/image_utils.py
index f91535a0ad4..e56c1c651c4 100644
--- a/release/scripts/modules/bpy_extras/image_utils.py
+++ b/release/scripts/modules/bpy_extras/image_utils.py
@@ -86,7 +86,9 @@ def load_image(imagepath,
     variants = [imagepath]
 
     if dirname:
-        variants += [os.path.join(dirname, imagepath), os.path.join(dirname, os.path.basename(imagepath))]
+        variants += [os.path.join(dirname, imagepath),
+                     os.path.join(dirname, bpy.path.basename(imagepath)),
+                     ]
 
     for filepath_test in variants:
         if ncase_cmp:
@@ -99,7 +101,7 @@ def load_image(imagepath,
                 return _image_load(nfilepath)
 
     if place_holder:
-        image = bpy.data.images.new(os.path.basename(imagepath), 128, 128)
+        image = bpy.data.images.new(bpy.path.basename(imagepath), 128, 128)
         # allow the path to be resolved later
         image.filepath = imagepath
         return image
diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py
index 34c5b0d922a..4bb53f776ba 100644
--- a/release/scripts/startup/bl_operators/image.py
+++ b/release/scripts/startup/bl_operators/image.py
@@ -163,7 +163,7 @@ class ProjectEdit(bpy.types.Operator):
             filepath_final = filepath + ("%.3d.%s" % (i, EXT))
             i += 1
 
-        image_new.name = os.path.basename(filepath_final)
+        image_new.name = bpy.path.basename(filepath_final)
         ProjectEdit._proj_hack[0] = image_new.name
 
         image_new.filepath_raw = filepath_final  # TODO, filepath raw is crummy

From 76e91d7a5f8c253543bd1c938c8e74872d7a6c81 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 20 Jul 2011 15:33:27 +0000
Subject: [PATCH 14/28] fix [#27922] using preset_paths() with an absolute path
 returns twice the same thing raise an error when an invalid subdir is passed
 to preset_paths()

---
 release/scripts/modules/bpy/utils.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index 7c0d3d24cba..57d3e6dd703 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -298,11 +298,18 @@ _presets = _os.path.join(_scripts[0], "presets")  # FIXME - multiple paths
 def preset_paths(subdir):
     """
     Returns a list of paths for a specific preset.
+
+    :arg subdir: preset subdirectory (must not be an absolute path).
+    :type subdir: string
+    :return: script paths.
+    :rtype: list
     """
     dirs = []
     for path in script_paths("presets", all=True):
         directory = _os.path.join(path, subdir)
-        if _os.path.isdir(directory):
+        if not directory.startswith(path):
+            raise Exception("invalid subdir given %r" % subdir)
+        elif _os.path.isdir(directory):
             dirs.append(directory)
     return dirs
 

From 28780342eddb0e1e767bf64d69cb99bd138d621f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 21 Jul 2011 00:41:00 +0000
Subject: [PATCH 15/28] fix/workaround [#28040] float images reduced to 256
 levels per channel upon save

Generated images would not be re-generated with a float buffer on load, even when selected on creation.
Now save the float buffer setting as a generated image flag.

This means you can enable before baking to enable baking to a float buffer.
---
 source/blender/blenkernel/intern/image.c           | 3 ++-
 source/blender/editors/space_image/image_buttons.c | 1 +
 source/blender/makesdna/DNA_image_types.h          | 6 +++++-
 source/blender/makesrna/intern/rna_image.c         | 5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index c48497c45a1..ab67d7e3f25 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -432,6 +432,7 @@ Image *BKE_add_image_size(unsigned int width, unsigned int height, const char *n
 		ima->gen_x= width;
 		ima->gen_y= height;
 		ima->gen_type= uvtestgrid;
+		ima->gen_flag |= (floatbuf ? IMA_GEN_FLOAT : 0);
 		
 		ibuf= add_ibuf_size(width, height, name, depth, floatbuf, uvtestgrid, color);
 		image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
@@ -2172,7 +2173,7 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
 				/* UV testgrid or black or solid etc */
 				if(ima->gen_x==0) ima->gen_x= 1024;
 				if(ima->gen_y==0) ima->gen_y= 1024;
-				ibuf= add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 24, 0, ima->gen_type, color);
+				ibuf= add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 24, (ima->gen_flag & IMA_GEN_FLOAT) != 0, ima->gen_type, color);
 				image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 				ima->ok= IMA_OK_LOADED;
 			}
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index e9ebe78da29..66e844e67a8 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -804,6 +804,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
 				col= uiLayoutColumn(split, 1);
 				uiItemR(col, &imaptr, "generated_width", 0, "X", ICON_NONE);
 				uiItemR(col, &imaptr, "generated_height", 0, "Y", ICON_NONE);
+				uiItemR(col, &imaptr, "use_generated_float", 0, NULL, ICON_NONE);
 
 				uiItemR(split, &imaptr, "generated_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 			}
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 99ed2319415..dd033339ca4 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -102,7 +102,8 @@ typedef struct Image {
 	short animspeed;
 	
 	/* for generated images */
-	short gen_x, gen_y, gen_type;
+	short gen_x, gen_y;
+	char gen_type, gen_flag;
 	
 	/* display aspect - for UV editing images resized for faster openGL display */
 	float aspx, aspy;
@@ -136,5 +137,8 @@ typedef struct Image {
 #define IMA_MAX_RENDER_TEXT		512
 #define IMA_MAX_RENDER_SLOT		8
 
+/* gen_flag */
+#define IMA_GEN_FLOAT		1
+
 #endif
 
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index a52849b3366..eac4932ac43 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -502,6 +502,11 @@ static void rna_def_image(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Generated Height", "Generated image height");
 	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_generated_update");
 
+	prop= RNA_def_property(srna, "use_generated_float", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "gen_flag", IMA_GEN_FLOAT);
+	RNA_def_property_ui_text(prop, "Float Buffer", "Generate floating point buffer");
+	RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_generated_update");
+
 	/* realtime properties */
 	prop= RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");

From 98774eba0e459faf801d5be4bed3588b75166a1b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 21 Jul 2011 01:30:26 +0000
Subject: [PATCH 16/28] fix [#28037] Missing orange selection lines (trivial)

From what I can tell there is no good fix for this bug, calculating the 2d/3d viewborder and then attempting to align them to be pixel perfect fails because of float imprecision.

Added a workaround, so the camera border is always drawn in 2d space,
since this workaround may cause problems later on its kept under the define VIEW3D_CAMERA_BORDER_HACK so we can get old behavior back easily.
---
 source/blender/editors/space_view3d/drawobject.c  | 15 ++++++++++++++-
 source/blender/editors/space_view3d/view3d_draw.c | 14 +++++++++++++-
 .../blender/editors/space_view3d/view3d_intern.h  | 10 ++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index e314d249e6d..e6889f4563f 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1335,6 +1335,11 @@ static void draw_focus_cross(float dist, float size)
 	glEnd();
 }
 
+#ifdef VIEW3D_CAMERA_BORDER_HACK
+float view3d_camera_border_hack_col[4];
+short view3d_camera_border_hack_test= FALSE;
+#endif
+
 /* flag similar to draw_object() */
 static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, int flag)
 {
@@ -1348,7 +1353,15 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob
 	const float scax= 1.0f / len_v3(ob->obmat[0]);
 	const float scay= 1.0f / len_v3(ob->obmat[1]);
 	const float scaz= 1.0f / len_v3(ob->obmat[2]);
-	
+
+#ifdef VIEW3D_CAMERA_BORDER_HACK
+	if(is_view && !(G.f & G_PICKSEL)) {
+		glGetFloatv(GL_CURRENT_COLOR, view3d_camera_border_hack_col);
+		view3d_camera_border_hack_test= TRUE;
+		return;
+	}
+#endif
+
 	cam= ob->data;
 	aspx= (float) scene->r.xsch*scene->r.xasp;
 	aspy= (float) scene->r.ysch*scene->r.yasp;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 0ed62f3953f..d2ff6eef097 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1007,6 +1007,8 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 	/* note: quite un-scientific but without this bit extra
 	 * 0.0001 on the lower left the 2D border sometimes
 	 * obscures the 3D camera border */
+	/* note: with VIEW3D_CAMERA_BORDER_HACK defined this error isn't noticable
+	 * but keep it here incase we need to remove the workaround */
 	x1i= (int)(x1 - 1.0001f);
 	y1i= (int)(y1 - 1.0001f);
 	x2i= (int)(x2 + (1.0f-0.0001f));
@@ -1039,7 +1041,17 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 	setlinestyle(0);
 	UI_ThemeColor(TH_BACK);
 	glRectf(x1i, y1i, x2i, y2i);
-	
+
+#ifdef VIEW3D_CAMERA_BORDER_HACK
+	{
+		if(view3d_camera_border_hack_test == TRUE) {
+			glColor4fv(view3d_camera_border_hack_col);
+			glRectf(x1i+1, y1i+1, x2i-1, y2i-1);
+			view3d_camera_border_hack_test= FALSE;
+		}
+	}
+#endif
+
 	setlinestyle(3);
 	UI_ThemeColor(TH_WIRE);
 	glRectf(x1i, y1i, x2i, y2i);
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index aa92f0d0a59..d3886d48873 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -194,6 +194,16 @@ extern const char *view3d_context_dir[]; /* doc access */
 /* draw_volume.c */
 void draw_volume(struct ARegion *ar, struct GPUTexture *tex, float *min, float *max, int res[3], float dx, struct GPUTexture *tex_shadow);
 
+/* workaround for trivial but noticable camera bug caused by imprecision
+ * between view border calculation in 2D/3D space, workaround for bug [#28037].
+ * without this deifne we get the old behavior which is to try and align them
+ * both which _mostly_ works fine, but when the camera moves beyond ~1000 in
+ * any direction it starts to fail */
+#define VIEW3D_CAMERA_BORDER_HACK
+#ifdef VIEW3D_CAMERA_BORDER_HACK
+extern float view3d_camera_border_hack_col[4];
+extern short view3d_camera_border_hack_test;
+#endif
 
 #endif /* ED_VIEW3D_INTERN_H */
 

From c608288d76472856a0a0f7d1f1f0be4eebe15b88 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 21 Jul 2011 01:37:15 +0000
Subject: [PATCH 17/28] add tip that duplicator system doesnt support xray /
 transp object draw options since we keep getting reports about this.

---
 source/blender/makesrna/intern/rna_object.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 61e65585dd4..76bbfcbed41 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2274,12 +2274,12 @@ static void rna_def_object(BlenderRNA *brna)
 	
 	prop= RNA_def_property(srna, "show_transparent", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWTRANSP);
-	RNA_def_property_ui_text(prop, "Draw Transparent", "Displays material transparency in the object");
+	RNA_def_property_ui_text(prop, "Draw Transparent", "Displays material transparency in the object (unsupported for duplicator drawing)");
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
 	
 	prop= RNA_def_property(srna, "show_x_ray", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWXRAY);
-	RNA_def_property_ui_text(prop, "X-Ray", "Makes the object draw in front of others");
+	RNA_def_property_ui_text(prop, "X-Ray", "Makes the object draw in front of others (unsupported for duplicator drawing)");
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
 	
 	/* Grease Pencil */

From 314fdb941e28d5f1fbe2acace6133d6216f4e36c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 21 Jul 2011 02:00:29 +0000
Subject: [PATCH 18/28] revert recent matrix multiplication patch:  [#28032]
 Python Mathutils: Matrix Multiplication Error

Since they ended up reversing the order we better keep old code unless its proven to be incorrect.
also change Matrix.__repr__ function args to evaluate correctly (need to be inside a tuple).
---
 .../python/mathutils/mathutils_Matrix.c       | 51 +++++++++----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index a7ed63776a5..76a0994c3aa 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -1318,21 +1318,20 @@ static PyObject *Matrix_repr(MatrixObject *self)
 		}
 	}
 	switch(self->row_size) {
-	case 2:	return PyUnicode_FromFormat("Matrix(%R,\n"
-										"       %R)", rows[0], rows[1]);
+	case 2:	return PyUnicode_FromFormat("Matrix((%R,\n"
+										"        %R))", rows[0], rows[1]);
 
-	case 3:	return PyUnicode_FromFormat("Matrix(%R,\n"
-										"       %R,\n"
-										"       %R)", rows[0], rows[1], rows[2]);
+	case 3:	return PyUnicode_FromFormat("Matrix((%R,\n"
+										"        %R,\n"
+										"        %R))", rows[0], rows[1], rows[2]);
 
-	case 4:	return PyUnicode_FromFormat("Matrix(%R,\n"
-										"       %R,\n"
-										"       %R,\n"
-										"       %R)", rows[0], rows[1], rows[2], rows[3]);
+	case 4:	return PyUnicode_FromFormat("Matrix((%R,\n"
+										"        %R,\n"
+										"        %R,\n"
+										"        %R))", rows[0], rows[1], rows[2], rows[3]);
 	}
 
-	PyErr_SetString(PyExc_RuntimeError,
-	                "internal error!");
+	Py_FatalError("Matrix(): invalid row size!");
 	return NULL;
 }
 
@@ -1587,26 +1586,24 @@ static PyObject *Matrix_mul(PyObject *m1, PyObject *m2)
 
 	if(mat1 && mat2) {
 		/*MATRIX * MATRIX*/
-		if(mat2->row_size != mat1->col_size){
-			PyErr_SetString(PyExc_ValueError,
-			                "Matrix multiplication: "
-			                "matrix A rowsize must equal matrix B colsize");
-			return NULL;
-		}
-		else {
-			float mat[16]= {0.0f};
-			int x, y, z;
+		float mat[16]= {0.0f, 0.0f, 0.0f, 0.0f,
+						0.0f, 0.0f, 0.0f, 0.0f,
+						0.0f, 0.0f, 0.0f, 0.0f,
+						0.0f, 0.0f, 0.0f, 1.0f};
+		double dot = 0.0f;
+		int x, y, z;
 
-			for(x = 0; x < mat2->row_size; x++) {
-				for(y = 0; y < mat1->col_size; y++) {
-					for(z = 0; z < mat1->row_size; z++) {
-						mat[x * mat2->col_size + y] += (mat2->matrix[x][z] * mat1->matrix[z][y]);
-					}
+		for(x = 0; x < mat2->row_size; x++) {
+			for(y = 0; y < mat1->col_size; y++) {
+				for(z = 0; z < mat1->row_size; z++) {
+					dot += (mat1->matrix[z][y] * mat2->matrix[x][z]);
 				}
+				mat[((x * mat1->col_size) + y)] = (float)dot;
+				dot = 0.0f;
 			}
-
-			return newMatrixObject(mat, mat1->row_size, mat2->col_size, Py_NEW, Py_TYPE(mat1));
 		}
+
+		return newMatrixObject(mat, mat2->row_size, mat1->col_size, Py_NEW, Py_TYPE(mat1));
 	}
 	else if(mat2) {
 		/*FLOAT/INT * MATRIX */

From e7669caf5a21cfda67fd73aee795932eaba8067e Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Thu, 21 Jul 2011 08:10:34 +0000
Subject: [PATCH 19/28] Fixed bug with multires baking to float buffers. Was
 missed a flag to set rect marked as changed.

---
 source/blender/editors/object/object_bake.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index bdd911d68ee..679e4e58017 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -860,6 +860,10 @@ static void finish_images(MultiresBakeRender *bkr)
 		RE_bake_ibuf_filter(ibuf, (char *)ibuf->userdata, bkr->bake_filter);
 
 		ibuf->userflags|= IB_BITMAPDIRTY;
+
+		if(ibuf->rect_float)
+			ibuf->userflags|= IB_RECT_INVALID;
+
 		if(ibuf->mipmap[0]) {
 			ibuf->userflags|= IB_MIPMAP_INVALID;
 			imb_freemipmapImBuf(ibuf);

From 3e9d1d7683c7d7bf2386c73048808bacd238d550 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Thu, 21 Jul 2011 09:50:39 +0000
Subject: [PATCH 20/28] Corrected View Selected operator for image editor so
 now it works fine for images with different X and Y aspect ratio.

---
 source/blender/editors/space_image/image_ops.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 10b8cb238aa..d5515bd1cf8 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -500,7 +500,7 @@ static int view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 	Scene *scene;
 	Object *obedit;
 	Image *ima;
-	float size, min[2], max[2], d[2];
+	float size, min[2], max[2], d[2], aspx, aspy;
 	int width, height;
 
 	/* retrieve state */
@@ -511,6 +511,10 @@ static int view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 
 	ima= ED_space_image(sima);
 	ED_space_image_size(sima, &width, &height);
+	ED_image_aspect(ima, &aspx, &aspy);
+
+	width= width*aspx;
+	height= height*aspy;
 
 	/* get bounds */
 	if(!ED_uvedit_minmax(scene, ima, obedit, min, max))

From bbfe3c9c49523d3987a3144da119d8f6afd09cf9 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Thu, 21 Jul 2011 17:40:20 +0000
Subject: [PATCH 21/28] Bugfix #28034

Blender render optimizes alpha=0 materials away, unless it has
a number of properties... but there wasn't a check for material
being ray-mirror, it then should be rendered always.
---
 source/blender/render/intern/source/convertblender.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 583b792f240..2a7fb468bfa 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3375,7 +3375,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 				
 				/* test for 100% transparant */
 				ok= 1;
-				if(ma->alpha==0.0f && ma->spectra==0.0f && ma->filter==0.0f && (ma->mode & MA_TRANSP)) { 
+				if(ma->alpha==0.0f && ma->spectra==0.0f && ma->filter==0.0f && (ma->mode & MA_TRANSP) && (ma->mode & MA_RAYMIRROR)==0) { 
 					ok= 0;
 					/* texture on transparency? */
 					for(a=0; a<MAX_MTEX; a++) {

From 2c798fd86d9a9aed1c2459f5550bacb03d583f96 Mon Sep 17 00:00:00 2001
From: Daniel Salazar <zanqdo@gmail.com>
Date: Thu, 21 Jul 2011 21:34:08 +0000
Subject: [PATCH 22/28] Adding Shear transform to UV menu and Ctrl Alt Shift S
 hotkey (same as in 3D View)

---
 release/scripts/startup/bl_ui/space_image.py     | 4 ++++
 source/blender/editors/transform/transform_ops.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 722b46aba11..fa5579ea2e0 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -198,6 +198,10 @@ class IMAGE_MT_uvs_transform(bpy.types.Menu):
         layout.operator("transform.rotate")
         layout.operator("transform.resize")
 
+        layout.separator()
+
+        layout.operator("transform.shear")
+
 
 class IMAGE_MT_uvs_snap(bpy.types.Menu):
     bl_label = "Snap"
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 7bdf6c909d9..2d0c1ac2818 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -954,6 +954,8 @@ void transform_keymap_for_space(wmKeyConfig *keyconf, wmKeyMap *keymap, int spac
 
 			WM_keymap_add_item(keymap, OP_RESIZE, SKEY, KM_PRESS, 0, 0);
 
+			WM_keymap_add_item(keymap, OP_SHEAR, SKEY, KM_PRESS, KM_ALT|KM_CTRL|KM_SHIFT, 0);
+
 			WM_keymap_add_item(keymap, "TRANSFORM_OT_mirror", MKEY, KM_PRESS, KM_CTRL, 0);
 
 			km = WM_keymap_add_item(keymap, "WM_OT_context_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0);

From e6604288c8886b2c236c1765734a6ed71b8f0ae8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 21 Jul 2011 23:06:51 +0000
Subject: [PATCH 23/28] cmake - option to disable the frame server

---
 CMakeLists.txt                                      | 1 +
 source/blender/blenkernel/CMakeLists.txt            | 4 ++++
 source/blender/blenkernel/SConscript                | 1 +
 source/blender/blenkernel/intern/writeframeserver.c | 2 ++
 source/blender/makesrna/intern/CMakeLists.txt       | 4 ++++
 source/blender/makesrna/intern/SConscript           | 2 ++
 source/blender/makesrna/intern/rna_scene.c          | 2 ++
 7 files changed, 16 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebf7aa8a6c0..d4489a8c76b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,6 +155,7 @@ option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
 option(WITH_IMAGE_REDCODE       "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering" ON)
 
 # Audio/Video format support
 option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 9a384c40e24..defcef58463 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -279,6 +279,10 @@ if(WITH_IMAGE_CINEON)
 	add_definitions(-DWITH_CINEON)
 endif()
 
+if(WITH_IMAGE_FRAMESERVER)
+	add_definitions(-DWITH_FRAMESERVER)
+endif()
+
 if(WITH_IMAGE_HDR)
 	add_definitions(-DWITH_HDR)
 endif()
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 36afce7946c..5ea42ee65ae 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -22,6 +22,7 @@ incs += ' ' + env['BF_ZLIB_INC']
 defs = [ 'GLEW_STATIC' ]
 
 defs.append('WITH_SMOKE')  # TODO, make optional
+defs.append('WITH_FRAMESERVER')  # TODO, make optional
 
 if env['WITH_BF_PYTHON']:
     incs += ' ../python'
diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c
index 2239f6d3147..d13d15d1269 100644
--- a/source/blender/blenkernel/intern/writeframeserver.c
+++ b/source/blender/blenkernel/intern/writeframeserver.c
@@ -22,6 +22,7 @@
  *
  */
 
+#ifdef WITH_FRAMESERVER
 
 #include <string.h>
 #include <stdio.h>
@@ -381,3 +382,4 @@ void end_frameserver(void)
 	shutdown_socket_system();
 }
 
+#endif /* WITH_FRAMESERVER */
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index c9865bf3df4..cb593e7deab 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -171,6 +171,10 @@ if(WITH_IMAGE_HDR)
 	add_definitions(-DWITH_HDR)
 endif()
 
+if(WITH_IMAGE_FRAMESERVER)
+	add_definitions(-DWITH_FRAMESERVER)
+endif()
+
 if(WITH_AUDASPACE)
 	add_definitions(-DWITH_AUDASPACE)
 endif()
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 421c3a60691..5e43ed9b2fb 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -54,6 +54,8 @@ if env['WITH_BF_CINEON']:
 if env['WITH_BF_HDR']:
     defs.append('WITH_HDR')
 
+defs.append('WITH_FRAMESERVER')  # TODO, make optional
+
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 662ce04552e..9f751da484e 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -135,7 +135,9 @@ EnumPropertyItem image_type_items[] = {
 #endif
 	{R_AVIJPEG, "AVI_JPEG", ICON_FILE_MOVIE, "AVI JPEG", "Output video in AVI JPEG format"},
 	{R_AVIRAW, "AVI_RAW", ICON_FILE_MOVIE, "AVI Raw", "Output video in AVI Raw format"},
+#ifdef WITH_FRAMESERVER
 	{R_FRAMESERVER, "FRAMESERVER", ICON_FILE_SCRIPT, "Frame Server", "Output image to a frameserver"},
+#endif
 #ifdef WITH_FFMPEG
 	{R_H264, "H264", ICON_FILE_MOVIE, "H.264", "Output video in H.264 format"},
 	{R_FFMPEG, "FFMPEG", ICON_FILE_MOVIE, "MPEG", "Output video in MPEG format"},

From 58895bee7bb1b877a7ba1e1648e75c9598706566 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 21 Jul 2011 23:36:17 +0000
Subject: [PATCH 24/28] fix [#28052] PET: Shift-O cycling skips "random
 falloff"

---
 source/blender/editors/transform/transform.c | 2 +-
 source/blender/makesdna/DNA_scene_types.h    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index d3a30991aa6..eea77e36f7c 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -969,7 +969,7 @@ int transformEvent(TransInfo *t, wmEvent *event)
 			break;
 		case OKEY:
 			if (t->flag & T_PROP_EDIT && event->shift) {
-				t->prop_mode = (t->prop_mode + 1) % 6;
+				t->prop_mode = (t->prop_mode + 1) % PROP_MODE_MAX;
 				calculatePropRatio(t);
 				t->redraw |= TREDRAW_HARD;
 			}
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 3c14dacf973..8203a4dd77c 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1107,7 +1107,8 @@ typedef struct Scene {
 #define PROP_SHARP             3
 #define PROP_LIN               4
 #define PROP_CONST             5
-#define PROP_RANDOM		6
+#define PROP_RANDOM            6
+#define PROP_MODE_MAX          7
 
 /* toolsettings->proportional */
 #define PROP_EDIT_OFF			0

From 03bae345bebd01cd513e2b477e8409048c3f142c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 22 Jul 2011 00:31:24 +0000
Subject: [PATCH 25/28] fix [#28053] New material tooltip

---
 source/blender/editors/render/render_shading.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index fdd53d27b02..cfed2750e18 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -108,7 +108,7 @@ void OBJECT_OT_material_slot_add(wmOperatorType *ot)
 	/* identifiers */
 	ot->name= "Add Material Slot";
 	ot->idname= "OBJECT_OT_material_slot_add";
-	ot->description="Add a new material slot or duplicate the selected one";
+	ot->description="Add a new material slot";
 	
 	/* api callbacks */
 	ot->exec= material_slot_add_exec;

From 6040a28f039dc73cc62372fd329fe38e25b8f31f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 22 Jul 2011 00:34:03 +0000
Subject: [PATCH 26/28] missed this file when adding option to disable
 frameserver

---
 source/blender/blenkernel/intern/writeavi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c
index ba7f9bdd415..769a3f9b11e 100644
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@ -105,13 +105,18 @@ bMovieHandle *BKE_get_movie_handle(int imtype)
 		mh.get_movie_path = filepath_ffmpeg;
 	}
 #endif
+#ifdef WITH_FRAMESERVER
 	if (imtype == R_FRAMESERVER) {
 		mh.start_movie = start_frameserver;
 		mh.append_movie = append_frameserver;
 		mh.end_movie = end_frameserver;
 		mh.get_next_frame = frameserver_loop;
 	}
-	
+#endif
+
+	/* incase all above are disabled */
+	(void)imtype;
+
 	return &mh;
 }
 

From 30da1336a8d7811fb9409c6e48209f7a533af1cc Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 22 Jul 2011 01:21:20 +0000
Subject: [PATCH 27/28] patch [#28045] Straighten tool from Simple Todos from
 Kyle Mills (khonkhortisan)

---
 source/blender/editors/uvedit/uvedit_ops.c | 131 +++++++++++++++++++++
 1 file changed, 131 insertions(+)

diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index c09f8cff02d..d0393c970a6 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -1057,6 +1057,134 @@ static void weld_align_uv(bContext *C, int tool)
 		}
 	}
 
+	if(tool == 's' || tool == 't' || tool == 'u') {
+		 /* pass 1&2 variables */
+		int i, j;
+		int starttmpl= -1, connectedtostarttmpl, startcorner;
+		int endtmpl= -1,   connectedtoendtmpl,   endcorner;
+		MTFace *startface, *endface;
+		int itmpl, jtmpl;
+		EditVert *eve;
+		int pass; /* first 2 passes find endpoints, 3rd pass moves middle points, 4th pass is fail-on-face-selected */
+		EditFace *startefa, *endefa;
+
+		 /* pass 3 variables */
+		float startx, starty, firstm,  firstb,  midx,      midy;
+		float endx,   endy,   secondm, secondb, midmovedx, midmovedy;
+		float IsVertical_check= -1;
+		float IsHorizontal_check= -1;
+
+		for(i= 0, eve= em->verts.first; eve; eve= eve->next, i++) /* give each point a unique name */
+			eve->tmp.l= i;
+		for(pass= 1; pass <= 3; pass++) { /* do this for each endpoint */
+			if(pass == 3){ /* calculate */
+				startx= startface->uv[startcorner][0];
+				starty= startface->uv[startcorner][1];
+				endx= endface->uv[endcorner][0];
+				endy= endface->uv[endcorner][1];
+				firstm= (endy-starty)/(endx-startx);
+				firstb= starty-(firstm*startx);
+				secondm= -1.0f/firstm;
+				if(startx == endx) IsVertical_check= startx;
+				if(starty == endy) IsHorizontal_check= starty;
+			}
+			for(efa= em->faces.first; efa; efa= efa->next) { /* for each face */
+				tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE); /* get face */
+				if(uvedit_face_visible(scene, ima, efa, tf)) { /* if you can see it */
+					if(uvedit_face_selected(scene, efa, tf)) { /* if the face is selected, get out now! */
+						pass= 4;
+						break;
+					}
+					for(i= 0; (i < 3 || (i == 3 && efa->v4)); i++) { /* for each point of the face */
+						itmpl= (*(&efa->v1 + i))->tmp.l; /* get unique name for points */
+						if(pass == 3) { /* move */
+							if(uvedit_uv_selected(scene, efa, tf, i)) {
+								if(!(itmpl == starttmpl || itmpl == endtmpl)) {
+									if(IsVertical_check != -1) tf->uv[i][0]= IsVertical_check;
+									if(IsHorizontal_check != -1) tf->uv[i][1]= IsHorizontal_check;
+									if((IsVertical_check == -1) && (IsHorizontal_check == -1)) {
+										midx= tf->uv[i][0];
+										midy= tf->uv[i][1];
+										if(tool == 's') {
+											secondb= midy-(secondm*midx);
+											midmovedx= (secondb-firstb)/(firstm-secondm);
+											midmovedy= (secondm*midmovedx)+secondb;
+											tf->uv[i][0]= midmovedx;
+											tf->uv[i][1]= midmovedy;
+										}
+										else if(tool == 't') {
+											tf->uv[i][0]= (midy-firstb)/firstm; /* midmovedx */
+										}
+										else if(tool == 'u') {
+											tf->uv[i][1]= (firstm*midx)+firstb; /* midmovedy */
+										}
+									}
+								}
+							}
+						}
+						else {
+							for(j= 0; (j < 3 || (j == 3 && efa->v4)); j++) { /* also for each point on the face */
+								jtmpl= (*(&efa->v1 + j))->tmp.l;
+								if(i != j && (!efa->v4 || ABS(i-j) !=  2)) { /* if the points are connected */
+									/* quad   (0,1,2,3) 0,1 0,3 1,0 1,2 2,1 2,3 3,0 3,2
+									 * triangle (0,1,2) 0,1 0,2 1,0 1,2 2,0 2,1 */
+									if(uvedit_uv_selected(scene, efa, tf, i) && uvedit_uv_selected(scene, efa, tf, j)) {
+										 /* if the edge is selected */
+										if(pass == 1) { /* if finding first endpoint */
+											if(starttmpl == -1) { /* if the first endpoint isn't found yet */
+												starttmpl= itmpl; /* set unique name for endpoint */
+												connectedtostarttmpl= jtmpl;
+												 /* get point that endpoint is connected to */
+												startface= tf; /* get face it's on */
+												startcorner= i; /* what corner of the face? */
+												startefa= efa;
+												efa= em->faces.first;
+												tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+												i= -1;
+												break;
+											}
+											if(starttmpl == itmpl && jtmpl != connectedtostarttmpl) {
+												starttmpl= -1; /* not an endpoint */
+												efa= startefa;
+												tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+												i= startcorner;
+												break;
+											}
+										}
+										else if(pass == 2) { /* if finding second endpoint */
+											if(endtmpl == -1 && itmpl != starttmpl) {
+												endtmpl= itmpl;
+												connectedtoendtmpl= jtmpl;
+												endface= tf;
+												endcorner= i;
+												endefa= efa;
+												efa= em->faces.first;
+												tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+												i= -1;
+												break;
+											}
+											if(endtmpl == itmpl && jtmpl != connectedtoendtmpl) {
+												endtmpl= -1;
+												efa= endefa;
+												tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+												i= endcorner;
+												break;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			if(pass == 2 && (starttmpl == -1 || endtmpl == -1)) {
+				/* if endpoints aren't found */
+				pass=4;
+			}
+		}
+	}
+
 	uvedit_live_unwrap_update(sima, scene, obedit);
 	DAG_id_tag_update(obedit->data, 0);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
@@ -1074,6 +1202,9 @@ static int align_exec(bContext *C, wmOperator *op)
 static void UV_OT_align(wmOperatorType *ot)
 {
 	static EnumPropertyItem axis_items[] = {
+		{'s', "ALIGN_S", 0, "Straighten", "Align UVs along the line defined by the endpoints"},
+		{'t', "ALIGN_T", 0, "Straighten X", "Align UVs along the line defined by the endpoints along the X axis"},
+		{'u', "ALIGN_U", 0, "Straighten Y", "Align UVs along the line defined by the endpoints along the Y axis"},
 		{'a', "ALIGN_AUTO", 0, "Align Auto", "Automatically choose the axis on which there is most alignment already"},
 		{'x', "ALIGN_X", 0, "Align X", "Align UVs on X axis"},
 		{'y', "ALIGN_Y", 0, "Align Y", "Align UVs on Y axis"},

From 0e933d089df3a17327caf8700c19df9f419a2973 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 22 Jul 2011 05:33:06 +0000
Subject: [PATCH 28/28] fix [#27910] baking ambient occlusion, do not consider
 closer object for blender 2.58a

---
 source/blender/render/intern/source/convertblender.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 2a7fb468bfa..7782077604d 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -5685,7 +5685,7 @@ void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay,
 	Object *camera;
 	float mat[4][4];
 	float amb[3];
-	const short onlyselected= !ELEM3(type, RE_BAKE_LIGHT, RE_BAKE_ALL, RE_BAKE_SHADOW);
+	const short onlyselected= !ELEM4(type, RE_BAKE_LIGHT, RE_BAKE_ALL, RE_BAKE_SHADOW, RE_BAKE_AO);
 	const short nolamps= ELEM3(type, RE_BAKE_NORMALS, RE_BAKE_TEXTURE, RE_BAKE_DISPLACEMENT);
 
 	re->main= bmain;