Revision: 49226
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49226
Author: nazgul
Date: 2012-07-25 20:28:06 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
Merging r49223 through r49225 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49223
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49225
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/source/blender/editors/space_outliner/outliner_tools.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-49222
+
/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-49225
Modified: branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp 2012-07-25
20:25:47 UTC (rev 49225)
+++ branches/soc-2011-tomato/intern/cycles/util/util_cache.cpp 2012-07-25
20:28:06 UTC (rev 49226)
@@ -26,6 +26,10 @@
#include "util_path.h"
#include "util_types.h"
+#if (BOOST_VERSION < 104400)
+# define BOOST_FILESYSTEM_VERSION 2
+#endif
+
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -115,7 +119,11 @@
boost::filesystem::directory_iterator it(dir), it_end;
for(; it != it_end; it++) {
+#if (BOOST_FILESYSTEM_VERSION == 2)
+ string filename = it->path().filename();
+#else
string filename = it->path().filename().string();
+#endif
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-25
20:25:47 UTC (rev 49225)
+++ branches/soc-2011-tomato/intern/cycles/util/util_path.cpp 2012-07-25
20:28:06 UTC (rev 49226)
@@ -26,6 +26,10 @@
#include <stdio.h>
+#if (BOOST_VERSION < 104400)
+# define BOOST_FILESYSTEM_VERSION 2
+#endif
+
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -58,7 +62,11 @@
string path_filename(const string& path)
{
+#if (BOOST_FILESYSTEM_VERSION == 2)
+ return boost::filesystem::path(path).filename();
+#else
return boost::filesystem::path(path).filename().string();
+#endif
}
string path_dirname(const string& path)
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49222
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49225
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49222
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49225
Modified:
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
2012-07-25 20:25:47 UTC (rev 49225)
+++
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
2012-07-25 20:28:06 UTC (rev 49226)
@@ -530,6 +530,18 @@
(void)tselem;
}
+static void data_select_linked_cb(int event, TreeElement *te, TreeStoreElem
*UNUSED(tselem), void *C_v)
+{
+ if (event == 5) {
+ if (RNA_struct_is_ID(te->rnaptr.type)) {
+ bContext *C = (bContext *) C_v;
+ ID *id = te->rnaptr.data;
+
+ ED_object_select_linked_by_id(C, id);
+ }
+ }
+}
+
static void outliner_do_data_operation(SpaceOops *soops, int type, int event,
ListBase *lb,
void (*operation_cb)(int, TreeElement
*, TreeStoreElem *, void *),
void *arg)
@@ -1131,6 +1143,7 @@
{2, "DESELECT", 0, "Deselect", ""},
{3, "HIDE", 0, "Hide", ""},
{4, "UNHIDE", 0, "Unhide", ""},
+ {5, "SELECT_LINKED", 0, "Select Linked", ""},
{0, NULL, 0, NULL, NULL}
};
@@ -1174,6 +1187,11 @@
outliner_do_data_operation(soops, datalevel, event,
&soops->tree, sequence_cb, scene);
}
}
+ else if (datalevel == TSE_RNA_STRUCT) {
+ if (event == 5) {
+ outliner_do_data_operation(soops, datalevel, event,
&soops->tree, data_select_linked_cb, C);
+ }
+ }
return OPERATOR_FINISHED;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
