[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49405] branches/soc-2011-tomato: Merging r49400 through r49404 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jul 30 19:12:56 CEST 2012
Revision: 49405
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49405
Author: nazgul
Date: 2012-07-30 17:12:55 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Merging r49400 through r49404 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49400
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49404
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.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-49399
+ /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-49404
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py 2012-07-30 17:12:01 UTC (rev 49404)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py 2012-07-30 17:12:55 UTC (rev 49405)
@@ -242,14 +242,18 @@
snode = context.space_data
tree = snode.node_tree
- layout.prop(tree, "render_quality", text="Render")
- layout.prop(tree, "edit_quality", text="Edit")
- layout.prop(tree, "chunk_size")
- layout.prop(tree, "use_opencl")
- layout.prop(tree, "two_pass")
- layout.prop(snode, "show_highlight")
-
+ col = layout.column()
+ col.prop(tree, "render_quality", text="Render")
+ col.prop(tree, "edit_quality", text="Edit")
+ col.prop(tree, "chunk_size")
+ col = layout.column()
+ col.prop(tree, "use_opencl")
+ col.prop(tree, "two_pass")
+ col.prop(snode, "show_highlight")
+ col.prop(snode, "use_hidden_preview")
+
+
class NODE_MT_node_color_presets(Menu):
"""Predefined node color"""
bl_label = "Color Presets"
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c 2012-07-30 17:12:01 UTC (rev 49404)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c 2012-07-30 17:12:55 UTC (rev 49405)
@@ -191,12 +191,14 @@
data.count_tot, data.count_changed, data.count_failed);
}
-/* find this file recursively, use the biggest file so thumbnails don't get used by mistake
- * - dir: subdir to search
- * - filename: set this filename
- * - filesize: filesize for the file
+/**
+ * find this file recursively, use the biggest file so thumbnails don't get used by mistake
+ * \param filename_new: the path will be copied here, caller must initialize as empyu string.
+ * \param dirname: subdir to search
+ * \param filename: set this filename
+ * \param filesize: filesize for the file
*
- * return found: 1/0.
+ * \returns found: 1/0.
*/
#define MAX_RECUR 16
static int findFileRecursive(char *filename_new,
@@ -213,8 +215,6 @@
int size;
int found = FALSE;
- filename_new[0] = '\0';
-
dir = opendir(dirname);
if (dir == NULL)
@@ -271,6 +271,8 @@
int recur_depth = 0;
int found;
+ filename_new[0] = '\0';
+
found = findFileRecursive(filename_new,
data->searchdir, BLI_path_basename((char *)path_src),
&filesize, &recur_depth);
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-49399
+ /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-49404
Modified: branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c 2012-07-30 17:12:01 UTC (rev 49404)
+++ branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c 2012-07-30 17:12:55 UTC (rev 49405)
@@ -920,7 +920,7 @@
oldptr = RNA_property_pointer_get(&ptr, prop);
oldima = (Image *)oldptr.id.data;
/* unlikely to fail but better avoid strange crash */
- if (oldima && GS(oldima->id.name) != ID_IM) {
+ if (oldima && GS(oldima->id.name) == ID_IM) {
ima = oldima;
}
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-07-30 17:12:01 UTC (rev 49404)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-07-30 17:12:55 UTC (rev 49405)
@@ -2589,6 +2589,10 @@
if (node->id)
id_us_plus(node->id);
+
+ if (snode->flag & SNODE_USE_HIDDEN_PREVIEW)
+ node->flag &= ~NODE_PREVIEW;
+
snode_update(snode, node);
}
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-49399
+ /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-49404
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h 2012-07-30 17:12:01 UTC (rev 49404)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h 2012-07-30 17:12:55 UTC (rev 49405)
@@ -912,6 +912,7 @@
SNODE_SHOW_B = (1 << 9),
SNODE_AUTO_RENDER = (1 << 5),
SNODE_SHOW_HIGHLIGHT = (1 << 6),
+ SNODE_USE_HIDDEN_PREVIEW = (1 << 10),
} eSpaceNode_Flag;
/* snode->texfrom */
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c 2012-07-30 17:12:01 UTC (rev 49404)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c 2012-07-30 17:12:55 UTC (rev 49405)
@@ -3005,6 +3005,11 @@
RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_SHOW_HIGHLIGHT);
RNA_def_property_ui_text(prop, "Highlight", "Highlight nodes that are being calculated");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
+
+ prop = RNA_def_property(srna, "use_hidden_preview", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_USE_HIDDEN_PREVIEW);
+ RNA_def_property_ui_text(prop, "Hide Preview", "Hide preview for newly creating nodes");
+ RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
}
static void rna_def_space_logic(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list