[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49499] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49478:49498
Campbell Barton
ideasman42 at gmail.com
Thu Aug 2 13:29:32 CEST 2012
Revision: 49499
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49499
Author: campbellbarton
Date: 2012-08-02 11:29:32 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49478:49498
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49478
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/buildbot/slave_pack.py
branches/soc-2011-tomato/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/release/scripts/templates/ui_panel.py
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_group.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/release/scripts/templates/ui_panel.py
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-49478
+ /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-49498
Modified: branches/soc-2011-tomato/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/slave_pack.py 2012-08-02 11:25:04 UTC (rev 49498)
+++ branches/soc-2011-tomato/build_files/buildbot/slave_pack.py 2012-08-02 11:29:32 UTC (rev 49499)
@@ -55,11 +55,14 @@
'WITHOUT_BF_INSTALL=True']
config = None
+ bits = None
if builder.endswith('linux_x86_64_scons'):
config = 'user-config-x86_64.py'
+ bits = 64
elif builder.endswith('linux_i386_scons'):
- config = 'user-config-x86_64.py'
+ config = 'user-config-i686.py'
+ bits = 32
if config is not None:
config_fpath = os.path.join(config_dir, config)
@@ -69,7 +72,16 @@
blenderplayer = os.path.join(install_dir, 'blenderplayer')
subprocess.call(['strip', '--strip-all', blender, blenderplayer])
+ extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
+ mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
+ software_gl = os.path.join(extra, 'blender-softwaregl')
+
+ os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
+ os.system('cp %s %s' % (software_gl, install_dir))
+ os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
+
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+
sys.exit(retcode)
else:
if builder.find('win') != -1:
Modified: branches/soc-2011-tomato/intern/smoke/intern/WAVELET_NOISE.h
===================================================================
--- branches/soc-2011-tomato/intern/smoke/intern/WAVELET_NOISE.h 2012-08-02 11:25:04 UTC (rev 49498)
+++ branches/soc-2011-tomato/intern/smoke/intern/WAVELET_NOISE.h 2012-08-02 11:29:32 UTC (rev 49499)
@@ -107,7 +107,7 @@
// if these values are not local incorrect results are generated
float downCoeffs[32] = { DOWNCOEFFS };
const float *const aCoCenter= &downCoeffs[16];
- for (int i = 0; i < n / 2; i++) {
+ for (int i = 0; i < ceil((float)n / 2); i++) {
to[i * stride] = 0;
for (int k = 2 * i - 16; k < 2 * i + 16; k++) {
// handle boundary
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-08-02 11:25:04 UTC (rev 49498)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py 2012-08-02 11:29:32 UTC (rev 49499)
@@ -94,6 +94,10 @@
if toolsettings.snap_node_element != 'INCREMENT':
row.prop(toolsettings, "snap_target", text="")
+ row = layout.row(align=True)
+ row.operator("node.clipboard_copy", text="", icon='COPYDOWN')
+ row.operator("node.clipboard_paste", text="", icon='PASTEDOWN')
+
layout.template_running_jobs()
Modified: branches/soc-2011-tomato/release/scripts/templates/ui_panel.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/templates/ui_panel.py 2012-08-02 11:25:04 UTC (rev 49498)
+++ branches/soc-2011-tomato/release/scripts/templates/ui_panel.py 2012-08-02 11:29:32 UTC (rev 49499)
@@ -1,56 +1,56 @@
-import bpy
-
-
-class LayoutDemoPanel(bpy.types.Panel):
- """Creates a Panel in the scene context of the properties editor"""
- bl_label = "Layout Demo"
- bl_idname = "SCENE_PT_layout"
- bl_space_type = 'PROPERTIES'
- bl_region_type = 'WINDOW'
- bl_context = "scene"
-
- def draw(self, context):
- layout = self.layout
-
- sc = context.scene
-
- #Create a simple row.
- layout.label(text=" Simple Row:")
-
- row = layout.row()
- row.prop(sc, "frame_start")
- row.prop(sc, "frame_end")
-
- #Create an row where the buttons are aligned to each other.
- layout.label(text=" Aligned Row")
-
- row = layout.row(align=True)
- row.prop(sc, "frame_start")
- row.prop(sc, "frame_end")
-
- #Create two columns, by using a split layout.
- split = layout.split()
-
- # First column
- col = split.column()
- col.label(text="Column One:")
- col.prop(sc, "frame_end")
- col.prop(sc, "frame_start")
-
- # Second column, aligned
- col = split.column(align=True)
- col.label(text="Column Two")
- col.prop(sc, "frame_start")
- col.prop(sc, "frame_end")
-
-
-def register():
- bpy.utils.register_class(LayoutDemoPanel)
-
-
-def unregister():
- bpy.utils.unregister_class(LayoutDemoPanel)
-
-
-if __name__ == "__main__":
- register()
+import bpy
+
+
+class LayoutDemoPanel(bpy.types.Panel):
+ """Creates a Panel in the scene context of the properties editor"""
+ bl_label = "Layout Demo"
+ bl_idname = "SCENE_PT_layout"
+ bl_space_type = 'PROPERTIES'
+ bl_region_type = 'WINDOW'
+ bl_context = "scene"
+
+ def draw(self, context):
+ layout = self.layout
+
+ sc = context.scene
+
+ #Create a simple row.
+ layout.label(text=" Simple Row:")
+
+ row = layout.row()
+ row.prop(sc, "frame_start")
+ row.prop(sc, "frame_end")
+
+ #Create an row where the buttons are aligned to each other.
+ layout.label(text=" Aligned Row")
+
+ row = layout.row(align=True)
+ row.prop(sc, "frame_start")
+ row.prop(sc, "frame_end")
+
+ #Create two columns, by using a split layout.
+ split = layout.split()
+
+ # First column
+ col = split.column()
+ col.label(text="Column One:")
+ col.prop(sc, "frame_end")
+ col.prop(sc, "frame_start")
+
+ # Second column, aligned
+ col = split.column(align=True)
+ col.label(text="Column Two")
+ col.prop(sc, "frame_start")
+ col.prop(sc, "frame_end")
+
+
+def register():
+ bpy.utils.register_class(LayoutDemoPanel)
+
+
+def unregister():
+ bpy.utils.unregister_class(LayoutDemoPanel)
+
+
+if __name__ == "__main__":
+ register()
Property changes on: branches/soc-2011-tomato/release/scripts/templates/ui_panel.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2011-tomato/source/blender/avi/intern/avi.c
===================================================================
--- branches/soc-2011-tomato/source/blender/avi/intern/avi.c 2012-08-02 11:25:04 UTC (rev 49498)
+++ branches/soc-2011-tomato/source/blender/avi/intern/avi.c 2012-08-02 11:29:32 UTC (rev 49499)
@@ -970,7 +970,7 @@
if (movie->entries != NULL) {
temp = (AviIndexEntry *)MEM_reallocN(movie->entries, (frame_num + 1) * entry_size);
/* clear new bytes */
- memset(&temp[movie->index_entries], 0, ((frame_num + 1) - movie->index_entries) * entry_size);
+ memset(&temp[movie->index_entries + 1], 0, (frame_num - movie->index_entries) * entry_size);
}
else {
temp = (AviIndexEntry *) MEM_callocN((frame_num + 1) * entry_size, "newidxentry");
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2012-08-02 11:25:04 UTC (rev 49498)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2012-08-02 11:29:32 UTC (rev 49499)
@@ -384,6 +384,13 @@
int nodeSocketIsHidden(struct bNodeSocket *sock);
void nodeSocketSetType(struct bNodeSocket *sock, int type);
+/* Node Clipboard */
+void nodeClipboardClear(void);
+void nodeClipboardAddNode(struct bNode *node);
+void nodeClipboardAddLink(struct bNodeLink *link);
+const struct ListBase *nodeClipboardGetNodes(void);
+const struct ListBase *nodeClipboardGetLinks(void);
+
/* ************** NODE TYPE ACCESS *************** */
struct bNodeTemplate nodeMakeTemplate(struct bNode *node);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2012-08-02 11:25:04 UTC (rev 49498)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2012-08-02 11:29:32 UTC (rev 49499)
@@ -347,10 +347,13 @@
bNodeSocket *sock, *oldsock;
*nnode = *node;
- nodeUniqueName(ntree, nnode);
-
- BLI_addtail(&ntree->nodes, nnode);
+ /* can be called for nodes outside a node tree (e.g. clipboard) */
+ if (ntree) {
+ nodeUniqueName(ntree, nnode);
+ BLI_addtail(&ntree->nodes, nnode);
+ }
+
BLI_duplicatelist(&nnode->inputs, &node->inputs);
oldsock = node->inputs.first;
for (sock = nnode->inputs.first; sock; sock = sock->next, oldsock = oldsock->next) {
@@ -390,7 +393,8 @@
nnode->new_node = NULL;
nnode->preview = NULL;
- ntree->update |= NTREE_UPDATE_NODES;
+ if (ntree)
+ ntree->update |= NTREE_UPDATE_NODES;
return nnode;
}
@@ -417,7 +421,7 @@
from = -1; /* OK but flip */
}
}
- else {
+ else if (ntree) {
/* check tree sockets */
for (sock = ntree->inputs.first; sock; sock = sock->next)
if (sock == fromsock)
@@ -446,7 +450,7 @@
to = -1; /* OK but flip */
}
}
- else {
+ else if (ntree) {
/* check tree sockets */
for (sock = ntree->outputs.first; sock; sock = sock->next)
if (sock == tosock)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list