Revision: 28358
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28358
Author: campbellbarton
Date: 2010-04-22 20:22:04 +0200 (Thu, 22 Apr 2010)
Log Message:
-----------
RenderBranch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28349:28357
Modified Paths:
--------------
branches/render25/release/scripts/ui/properties_data_modifier.py
branches/render25/release/scripts/ui/properties_particle.py
branches/render25/release/scripts/ui/space_outliner.py
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/makesrna/intern/rna_particle.c
Modified: branches/render25/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_modifier.py
2010-04-22 18:19:21 UTC (rev 28357)
+++ branches/render25/release/scripts/ui/properties_data_modifier.py
2010-04-22 18:22:04 UTC (rev 28358)
@@ -164,7 +164,7 @@
split = layout.split()
col = split.column()
- col.prop(md, "start")
+ col.prop(md, "frame_start")
col.prop(md, "length")
if wide_ui:
Modified: branches/render25/release/scripts/ui/properties_particle.py
===================================================================
--- branches/render25/release/scripts/ui/properties_particle.py 2010-04-22
18:19:21 UTC (rev 28357)
+++ branches/render25/release/scripts/ui/properties_particle.py 2010-04-22
18:22:04 UTC (rev 28358)
@@ -160,8 +160,8 @@
split = layout.split()
col = split.column(align=True)
- col.prop(part, "start")
- col.prop(part, "end")
+ col.prop(part, "frame_start")
+ col.prop(part, "frame_end")
col = split.column(align=True)
col.prop(part, "lifetime")
Modified: branches/render25/release/scripts/ui/space_outliner.py
===================================================================
--- branches/render25/release/scripts/ui/space_outliner.py 2010-04-22
18:19:21 UTC (rev 28357)
+++ branches/render25/release/scripts/ui/space_outliner.py 2010-04-22
18:22:04 UTC (rev 28358)
@@ -41,6 +41,8 @@
layout.prop(space, "display_mode", text="")
+ layout.prop(space, "display_filter", text="")
+
layout.separator()
if space.display_mode == 'DATABLOCKS':
Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c
2010-04-22 18:19:21 UTC (rev 28357)
+++ branches/render25/source/blender/blenloader/intern/readfile.c
2010-04-22 18:22:04 UTC (rev 28358)
@@ -12175,7 +12175,10 @@
/* give a base to loose objects. If group append, do it for objects too
*/
if(scene) {
- if(idcode==ID_GR) {
+ if(idcode==ID_SCE) {
+ /* dont instance anything when linking in scenes,
assume the scene its self instances the data */
+ }
+ else if(idcode==ID_GR) {
if (flag & FILE_LINK) {
give_base_to_objects(mainvar, scene, NULL, 0);
} else {
Modified: branches/render25/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/render25/source/blender/editors/space_node/node_edit.c
2010-04-22 18:19:21 UTC (rev 28357)
+++ branches/render25/source/blender/editors/space_node/node_edit.c
2010-04-22 18:22:04 UTC (rev 28358)
@@ -970,14 +970,13 @@
if(link==NULL) {
nodeAddLink(snode->edittree, tonode,
tonode->outputs.first, node, node->inputs.first);
- ntreeSolveOrder(snode->edittree);
- NodeTagChanged(snode->edittree, node);
}
- else if(link) {
+ else {
link->fromnode= tonode;
link->fromsock= tonode->outputs.first;
- NodeTagChanged(snode->edittree, node);
}
+ ntreeSolveOrder(snode->edittree);
+ NodeTagChanged(snode->edittree, node);
}
}
Modified: branches/render25/source/blender/editors/space_outliner/outliner.c
===================================================================
--- branches/render25/source/blender/editors/space_outliner/outliner.c
2010-04-22 18:19:21 UTC (rev 28357)
+++ branches/render25/source/blender/editors/space_outliner/outliner.c
2010-04-22 18:22:04 UTC (rev 28358)
@@ -1235,6 +1235,46 @@
}
}
+static int outliner_filter_has_name(TreeElement *te, char *name, int flags)
+{
+ int found= 0;
+
+ /* determine if match */
+ if(flags==OL_FIND)
+ found= BLI_strcasestr(te->name, name)!=NULL;
+ else if(flags==OL_FIND_CASE)
+ found= strstr(te->name, name)!=NULL;
+ else if(flags==OL_FIND_COMPLETE)
+ found= BLI_strcasecmp(te->name, name)==0;
+ else
+ found= strcmp(te->name, name)==0;
+
+ return found;
+}
+
+static void outliner_filter_tree(SpaceOops *soops, ListBase *lb)
+{
+ TreeElement *te, *ten;
+
+ if(soops->search_string[0]==0) return;
+
+ for (te= lb->first; te; te= ten) {
+ ten= te->next;
+
+ if(0==outliner_filter_has_name(te, soops->search_string,
OL_FIND)) {
+
+ outliner_free_tree(&te->subtree);
+ BLI_remlink(lb, te);
+
+ if(te->flag & TE_FREE_NAME) MEM_freeN(te->name);
+ MEM_freeN(te);
+ }
+ else
+ outliner_filter_tree(soops, &te->subtree);
+ }
+}
+
+
static void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops)
{
Base *base;
@@ -1416,6 +1456,7 @@
}
outliner_sort(soops, &soops->tree);
+ outliner_filter_tree(soops, &soops->tree);
}
/* **************** INTERACTIVE ************* */
Modified: branches/render25/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_modifier.c
2010-04-22 18:19:21 UTC (rev 28357)
+++ branches/render25/source/blender/makesrna/intern/rna_modifier.c
2010-04-22 18:22:04 UTC (rev 28358)
@@ -685,7 +685,8 @@
RNA_def_struct_sdna(srna, "BuildModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_BUILD);
- prop= RNA_def_property(srna, "start", PROP_FLOAT, PROP_TIME);
+ prop= RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_TIME);
+ RNA_def_property_float_sdna(prop, NULL, "start");
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
RNA_def_property_ui_text(prop, "Start", "Specify the start frame of the
effect");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
Modified: branches/render25/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_particle.c
2010-04-22 18:19:21 UTC (rev 28357)
+++ branches/render25/source/blender/makesrna/intern/rna_particle.c
2010-04-22 18:22:04 UTC (rev 28358)
@@ -1443,7 +1443,7 @@
RNA_def_property_ui_text(prop, "Rate", "Speed of Simplification");
/* general values */
- prop= RNA_def_property(srna, "start", PROP_FLOAT, PROP_NONE);
+ prop= RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "sta");//optional if prop names
are the same
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
@@ -1451,7 +1451,8 @@
RNA_def_property_ui_text(prop, "Start", "Frame # to start emitting
particles");
RNA_def_property_update(prop, 0, "rna_Particle_reset");
- prop= RNA_def_property(srna, "end", PROP_FLOAT, PROP_NONE);
+ prop= RNA_def_property(srna, "frame_end", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "end");
RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
