[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49948] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49945:49947
Campbell Barton
ideasman42 at gmail.com
Fri Aug 17 13:35:14 CEST 2012
Revision: 49948
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49948
Author: campbellbarton
Date: 2012-08-17 11:35:14 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49945:49947
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49945
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.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-49945
+ /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-49947
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py 2012-08-17 11:31:54 UTC (rev 49947)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py 2012-08-17 11:35:14 UTC (rev 49948)
@@ -57,10 +57,10 @@
def node_type_items_cb(self, context):
snode = context.space_data
if not snode:
- return []
+ return ()
tree = snode.edit_tree
if not tree:
- return []
+ return ()
# Lists of basic node types for each
if not node_type_items_dict:
@@ -76,7 +76,7 @@
if tree.type in node_type_items_dict:
return node_type_items_dict[tree.type] + node_group_items(tree.type)
else:
- return []
+ return ()
class NODE_OT_add_search(Operator):
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-49945
+ /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-49947
Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h 2012-08-17 11:31:54 UTC (rev 49947)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h 2012-08-17 11:35:14 UTC (rev 49948)
@@ -176,7 +176,7 @@
struct bContextStore *context;
- /* not ysed yet, was used in 2.4x for ui_draw_pulldown_round & friends */
+ /* not used yet, was used in 2.4x for ui_draw_pulldown_round & friends */
#if 0
void (*embossfunc)(int, int, float, float, float, float, float, int);
void (*sliderfunc)(int, float, float, float, float, float, float, int);
Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c 2012-08-17 11:31:54 UTC (rev 49947)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c 2012-08-17 11:35:14 UTC (rev 49948)
@@ -573,6 +573,9 @@
char *str;
opptr = uiButGetOperatorPtrRNA(but); /* allocated when needed, the button owns it */
+ /* so the context is passed to itemf functions (some py itemf functions use it) */
+ WM_operator_properties_sanitize(opptr, FALSE);
+
str = WM_operator_pystring(C, but->optype, opptr, 0);
/* operator info */
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-49945
+ /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-49947
More information about the Bf-blender-cvs
mailing list