[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28613] trunk/blender: last commit broke linking to scenes from the UI

[Campbell Barton]

Revision: 28613
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28613
Author:   campbellbarton
Date:     2010-05-06 13:47:10 +0200 (Thu, 06 May 2010)

Log Message:
-----------
last commit broke linking to scenes from the UI

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/animation/anim_markers.c
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py    2010-05-06 11:28:46 UTC 
(rev 28612)
+++ trunk/blender/release/scripts/ui/space_view3d.py    2010-05-06 11:47:10 UTC 
(rev 28613)
@@ -835,8 +835,8 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.operator_menu_enum("object.make_links_scene", "type", 
text="Objects to Scene...")
-        layout.operator_menu_enum("marker.make_links_scene", "type", 
text="Markers to Scene...")
+        layout.operator_menu_enum("object.make_links_scene", "scene", 
text="Objects to Scene...")
+        layout.operator_menu_enum("marker.make_links_scene", "scene", 
text="Markers to Scene...")
         layout.operator_enums("object.make_links_data", "type") # inline
 
 

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c       
2010-05-06 11:28:46 UTC (rev 28612)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c       
2010-05-06 11:47:10 UTC (rev 28613)
@@ -1112,6 +1112,7 @@
        /* properties */
        prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", 
"");
        RNA_def_enum_funcs(prop, RNA_scene_itemf);
+       ot->prop= prop;
 
 }
 

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c      
2010-05-06 11:28:46 UTC (rev 28612)
+++ trunk/blender/source/blender/editors/object/object_relations.c      
2010-05-06 11:47:10 UTC (rev 28613)
@@ -1266,6 +1266,7 @@
        /* properties */
        prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", 
"");
        RNA_def_enum_funcs(prop, RNA_scene_local_itemf);
+       ot->prop= prop;
 }
 
 void OBJECT_OT_make_links_data(wmOperatorType *ot)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs