Revision: 48862
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48862
Author: nazgul
Date: 2012-07-12 12:12:21 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Merging r48829 through r48861 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48829
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48861
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp
branches/soc-2011-tomato/intern/cycles/util/util_path.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-tomato/release/text/readme.html
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_rect.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CPUDevice.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-tomato/source/blender/editors/include/UI_view2d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_intern.h
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48828
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48861
Modified: branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp 2012-07-12
12:06:40 UTC (rev 48861)
+++ branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp 2012-07-12
12:12:21 UTC (rev 48862)
@@ -26,8 +26,6 @@
#include "util_path.h"
#include "util_types.h"
-#define BOOST_FILESYSTEM_VERSION 2
-
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -117,7 +115,7 @@
boost::filesystem::directory_iterator it(dir), it_end;
for(; it != it_end; it++) {
- string filename = it->path().filename();
+ string filename = it->path().filename().string();
if(boost::starts_with(filename, name))
if(except.find(filename) == except.end())
Modified: branches/soc-2011-tomato/intern/cycles/util/util_path.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_path.cpp 2012-07-12
12:06:40 UTC (rev 48861)
+++ branches/soc-2011-tomato/intern/cycles/util/util_path.cpp 2012-07-12
12:12:21 UTC (rev 48862)
@@ -26,8 +26,6 @@
#include <stdio.h>
-#define BOOST_FILESYSTEM_VERSION 2
-
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -60,7 +58,7 @@
string path_filename(const string& path)
{
- return boost::filesystem::path(path).filename();
+ return boost::filesystem::path(path).filename().string();
}
string path_dirname(const string& path)
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
2012-07-12 12:06:40 UTC (rev 48861)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
2012-07-12 12:12:21 UTC (rev 48862)
@@ -1235,9 +1235,11 @@
// Progress fill
progressBox = NSInsetRect(progressBox, 1, 1);
- [[NSColor knobColor] setFill];
+
progressBox.size.width = progressBox.size.width * progress;
- NSRectFill(progressBox);
+ NSGradient *gradient = [[NSGradient alloc]
initWithStartingColor:[NSColor darkGrayColor] endingColor:[NSColor
lightGrayColor]];
+ [gradient drawInRect:progressBox angle:90];
+ [gradient release];
[dockIcon unlockFocus];
Modified:
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
---
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
2012-07-12 12:06:40 UTC (rev 48861)
+++
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
2012-07-12 12:12:21 UTC (rev 48862)
@@ -151,6 +151,7 @@
col.operator("object.vertex_group_remove", icon='ZOOMOUT', text="")
col.menu("MESH_MT_vertex_group_specials", icon='DOWNARROW_HLT',
text="")
if group:
+ col.separator()
col.operator("object.vertex_group_move", icon='TRIA_UP',
text="").direction = 'UP'
col.operator("object.vertex_group_move", icon='TRIA_DOWN',
text="").direction = 'DOWN'
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
2012-07-12 12:06:40 UTC (rev 48861)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
2012-07-12 12:12:21 UTC (rev 48862)
@@ -1309,6 +1309,17 @@
layout.menu("CLIP_MT_mask_animation")
+class CLIP_MT_select_mode(Menu):
+ bl_label = "Select Mode"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator_context = 'INVOKE_REGION_WIN'
+
+ layout.operator_enum("clip.mode_set", "mode")
+
+
class CLIP_MT_mask_visibility(Menu):
bl_label = "Show/Hide"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
2012-07-12 12:06:40 UTC (rev 48861)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
2012-07-12 12:12:21 UTC (rev 48862)
@@ -378,7 +378,7 @@
layout = self.layout
layout.operator("wm.url_open", text="Manual", icon='HELP').url =
"http://wiki.blender.org/index.php/Doc:2.6/Manual";
- layout.operator("wm.url_open", text="Release Log", icon='URL').url =
"http://www.blender.org/development/release-logs/blender-263";
+ layout.operator("wm.url_open", text="Release Log", icon='URL').url =
"http://www.blender.org/development/release-logs/blender-264";
layout.separator()
layout.operator("wm.url_open", text="Blender Website", icon='URL').url
= "http://www.blender.org";
Modified: branches/soc-2011-tomato/release/text/readme.html
===================================================================
--- branches/soc-2011-tomato/release/text/readme.html 2012-07-12 12:06:40 UTC
(rev 48861)
+++ branches/soc-2011-tomato/release/text/readme.html 2012-07-12 12:12:21 UTC
(rev 48862)
@@ -12,18 +12,18 @@
</style>
</head>
<body>
-<p class="title"><b>Blender 2.63</b></p>
+<p class="title"><b>Blender 2.64</b></p>
<p><br></p>
<p class="header"><b>About</b></p>
<p class="body">Welcome to Blender, the free, open source 3D application for
modeling, animation, rendering, compositing, video editing and game creation.
Blender is available for Linux, Mac OS X, Windows and FreeBSD and has a large
world-wide community.</p>
<p class="body">Blender can be used freely for any purpose, including
commercial use and distribution. It's free and open-source software, released
under the GNU GPL licence. The entire source code is available on our
website.</p>
<p class="body">For more information, visit <a
href="http://www.blender.org";>blender.org</a>.</p>
<p><br></p>
-<p class="header"><b>2.63</b></p>
-<p class="body">The Blender Foundation and online developer community is proud
to present Blender 2.63. This release is the fourth official stable release of
the Blender 2.6 series, in which we will refine the 2.5 series and add exciting
new features. <a
href="http://www.blender.org/development/release-logs/blender-263/";>More
information about this release</a>.</p>
+<p class="header"><b>2.64</b></p>
+<p class="body">The Blender Foundation and online developer community is proud
to present Blender 2.64. This release is the fifth official stable release of
the Blender 2.6 series, in which we will refine the 2.5 series and add exciting
new features. <a
href="http://www.blender.org/development/release-logs/blender-263/";>More
information about this release</a>.</p>
<p><br></p>
<p class="header"><b>Bugs</b></p>
-<p class="body">Although Blender 2.63 is considered a stable release, you may
encounter a bug. If you do, please help us by posting it in the bug tracker or
using Help → Report a Bug from inside Blender. If it wasn’t reported yet,
please log in (or register) and fill in detailed information about the error.
Please post detailed instructions on how to reproduce it or post a .blend file
showcasing the bug.</p>
+<p class="body">Although Blender 2.64 is considered a stable release, you may
encounter a bug. If you do, please help us by posting it in the bug tracker or
using Help → Report a Bug from inside Blender. If it wasn’t reported yet,
please log in (or register) and fill in detailed information about the error.
Please post detailed instructions on how to reproduce it or post a .blend file
showcasing the bug.</p>
<p><br></p>
<p class="header"><b>Package Contents</b></p>
<p class="body">The downloaded Blender package includes:</p>
@@ -47,7 +47,7 @@
<p class="header"><b>Links</b></p>
<p class="body">Users:</p>
<p class="body"> General information <a
href="http://www.blender.org";>www.blender.org</a> <br>
- Full release log <a
href="http://www.blender.org/development/release-logs/blender-263/";>www.blender.org/development/release-logs/blender-263/</a><br>
+ Full release log <a
href="http://www.blender.org/development/release-logs/blender-264/";>www.blender.org/development/release-logs/blender-264/</a><br>
Tutorials <a
href="http://www.blender.org/education-help/";>www.blender.org/education-help/</a>
<br>
Manual <a
href="http://wiki.blender.org/index.php/Doc:2.6/Manual";>wiki.blender.org/index.php/Doc:2.6/Manual</a><br>
User Forum <a
href="http://www.blenderartists.org";>www.blenderartists.org</a><br>
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
2012-07-12 12:06:40 UTC (rev 48861)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
2012-07-12 12:12:21 UTC (rev 48862)
@@ -67,9 +67,10 @@
float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int
*tot_diff_point))[2];
float (*BKE_mask_spline_feather_differentiated_points(struct MaskSpline
*spline, int *tot_feather_point))[2];
+float (*BKE_mask_spline_differentiate_with_resolution_ex(struct MaskSpline
*spline, const int resol, int *tot_diff_point))[2];
float (*BKE_mask_spline_differentiate_with_resolution(struct MaskSpline
*spline, int width, int height, int *tot_diff_point))[2];
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
