Revision: 28614
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28614
Author: campbellbarton
Date: 2010-05-06 13:49:26 +0200 (Thu, 06 May 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28593:28613
Modified Paths:
--------------
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/editors/animation/anim_markers.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/space_outliner/outliner.c
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-05-06
11:47:10 UTC (rev 28613)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-05-06
11:49:26 UTC (rev 28614)
@@ -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: branches/render25/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/render25/source/blender/editors/animation/anim_markers.c
2010-05-06 11:47:10 UTC (rev 28613)
+++ branches/render25/source/blender/editors/animation/anim_markers.c
2010-05-06 11:49:26 UTC (rev 28614)
@@ -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: branches/render25/source/blender/editors/object/object_relations.c
===================================================================
--- branches/render25/source/blender/editors/object/object_relations.c
2010-05-06 11:47:10 UTC (rev 28613)
+++ branches/render25/source/blender/editors/object/object_relations.c
2010-05-06 11:49:26 UTC (rev 28614)
@@ -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)
Modified: branches/render25/source/blender/editors/space_outliner/outliner.c
===================================================================
--- branches/render25/source/blender/editors/space_outliner/outliner.c
2010-05-06 11:47:10 UTC (rev 28613)
+++ branches/render25/source/blender/editors/space_outliner/outliner.c
2010-05-06 11:49:26 UTC (rev 28614)
@@ -3854,7 +3854,7 @@
short groupmode= KSP_GROUP_KSNAME;
/* check if RNA-property described by this selected
element is an animateable prop */
- if ((tselem->type == TSE_RNA_PROPERTY) &&
RNA_property_animateable(&te->rnaptr, te->directdata)) {
+ if (ELEM(tselem->type, TSE_RNA_PROPERTY,
TSE_RNA_ARRAY_ELEM) && RNA_property_animateable(&te->rnaptr, te->directdata)) {
/* get id + path + index info from the selected
element */
tree_element_to_path(soops, te, tselem,
&id, &path, &array_index,
&flag, &groupmode);
@@ -3862,7 +3862,7 @@
/* only if ID and path were set, should we perform any
actions */
if (id && path) {
- int arraylen;
+ int arraylen = 1;
/* array checks */
if (flag & KSP_FLAG_WHOLE_ARRAY) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
