[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47605] branches/soc-2011-tomato: Merging r47581 through r47603 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Fri Jun 8 11:36:19 CEST 2012


Revision: 47605
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47605
Author:   nazgul
Date:     2012-06-08 09:36:17 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Merging r47581 through r47603 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47581
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47603

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
    branches/soc-2011-tomato/intern/raskter/raskter.c
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_OutputFileNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
    branches/soc-2011-tomato/source/blender/editors/interface/resources.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_add.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c

Added Paths:
-----------
    branches/soc-2011-tomato/release/datafiles/clkernelstoh.py
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl.h

Removed Paths:
-------------
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp

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-47580
   + /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-47603

Modified: branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c	2012-06-08 09:35:51 UTC (rev 47604)
+++ branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c	2012-06-08 09:36:17 UTC (rev 47605)
@@ -290,7 +290,9 @@
 	memt->tag3 = MEMTAG3;
 	
 	addtail(membase, &memh->next);
-	if (memh->next) memh->nextname = MEMNEXT(memh->next)->name;
+	if (memh->next) {
+		memh->nextname = MEMNEXT(memh->next)->name;
+	}
 	
 	totblock++;
 	mem_in_use += len;
@@ -681,8 +683,12 @@
 {
 	struct localLink *link = vlink;
 
+	/* for a generic API error checks here is fine but
+	 * the limited use here they will never be NULL */
+#if 0
 	if (link == NULL) return;
 	if (listbase == NULL) return;
+#endif
 
 	link->next = NULL;
 	link->prev = listbase->last;
@@ -696,8 +702,12 @@
 {
 	struct localLink *link = vlink;
 
+	/* for a generic API error checks here is fine but
+	 * the limited use here they will never be NULL */
+#if 0
 	if (link == NULL) return;
 	if (listbase == NULL) return;
+#endif
 
 	if (link->next) link->next->prev = link->prev;
 	if (link->prev) link->prev->next = link->next;

Modified: branches/soc-2011-tomato/intern/raskter/raskter.c
===================================================================
--- branches/soc-2011-tomato/intern/raskter/raskter.c	2012-06-08 09:35:51 UTC (rev 47604)
+++ branches/soc-2011-tomato/intern/raskter/raskter.c	2012-06-08 09:36:17 UTC (rev 47605)
@@ -170,7 +170,7 @@
  * for speed, but waiting on final design choices for curve-data before eliminating data the DEM code will need
  * if it ends up being coupled with this function.
  */
-int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts)
+static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts)
 {
 	int x_curr;                 /* current pixel position in X */
 	int y_curr;                 /* current scan line being drawn */
@@ -189,7 +189,8 @@
 	 * If the number of verts specified to render as a polygon is less than 3,
 	 * return immediately. Obviously we cant render a poly with sides < 3. The
 	 * return for this we set to 1, simply so it can be distinguished from the
-	 * next place we could return, /home/guest/blender-svn/soc-2011-tomato/intern/raskter/raskter.cwhich is a failure to allocate memory.
+	 * next place we could return, /home/guest/blender-svn/soc-2011-tomato/intern/raskter/raskter.
+	 * which is a failure to allocate memory.
 	 */
 	if (num_verts < 3) {
 		return(1);
@@ -384,8 +385,8 @@
 int PLX_raskterize(float (*base_verts)[2], int num_base_verts,
                    float *buf, int buf_x, int buf_y)
 {
-	int i;                                       /* i: Loop counter. */
-	struct poly_vert *ply;                       /* ply: Pointer to a list of integer buffer-space vertex coordinates. */
+	int i;                                   /* i: Loop counter. */
+	struct poly_vert *ply;                   /* ply: Pointer to a list of integer buffer-space vertex coordinates. */
 	struct r_fill_context ctx = {0};
 
 	/*
@@ -426,9 +427,9 @@
  * for speed, but waiting on final design choices for curve-data before eliminating data the DEM code will need
  * if it ends up being coupled with this function.
  */
-int rast_scan_feather(struct r_fill_context *ctx,
-                      float (*base_verts_f)[2], int num_base_verts,
-                      struct poly_vert *feather_verts, float (*feather_verts_f)[2], int num_feather_verts)
+static int rast_scan_feather(struct r_fill_context *ctx,
+                             float (*base_verts_f)[2], int num_base_verts,
+                             struct poly_vert *feather_verts, float (*feather_verts_f)[2], int num_feather_verts)
 {
 	int x_curr;                 /* current pixel position in X */
 	int y_curr;                 /* current scan line being drawn */

Copied: branches/soc-2011-tomato/release/datafiles/clkernelstoh.py (from rev 47603, trunk/blender/release/datafiles/clkernelstoh.py)
===================================================================
--- branches/soc-2011-tomato/release/datafiles/clkernelstoh.py	                        (rev 0)
+++ branches/soc-2011-tomato/release/datafiles/clkernelstoh.py	2012-06-08 09:36:17 UTC (rev 47605)
@@ -0,0 +1,70 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2012 Blender Foundation.
+# All rights reserved.
+#
+# Contributor(s): Jeroen Bakker
+#
+# ***** END GPL LICENCE BLOCK *****
+
+# <pep8 compliant>
+
+import sys
+import os
+
+if len(sys.argv) < 2:
+    sys.stdout.write("Usage: clkernelstoh <cl_file>\n")
+    sys.exit(1)
+
+filename = sys.argv[1]
+
+try:
+    fpin = open(filename, "r")
+except:
+    sys.stdout.write("Unable to open input %s\n" % sys.argv[1])
+    sys.exit(1)
+
+if filename[0:2] == "." + os.sep:
+    filename = filename[2:]
+
+cname = filename + ".h"
+sys.stdout.write("Making H file <%s>\n" % cname)
+
+filename = filename.split("/")[-1].split("\\")[-1]
+filename = filename.replace(".", "_")
+
+try:
+    fpout = open(cname, "w")
+except:
+    sys.stdout.write("Unable to open output %s\n" % cname)
+    sys.exit(1)
+
+fpout.write("/* clkernelstoh output of file <%s> */\n\n" % filename)
+fpout.write("const char * clkernelstoh_%s = " % filename)
+
+lines = fpin.readlines()
+for line in lines:
+	fpout.write("\"")
+	fpout.write(line.rstrip())
+	fpout.write("\\n\" \\\n")
+fpout.write("\"\\0\";\n")
+
+fpin.close()
+fpout.close()

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2012-06-08 09:35:51 UTC (rev 47604)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2012-06-08 09:36:17 UTC (rev 47605)
@@ -25,7 +25,7 @@
 class CLIP_HT_header(Header):
     bl_space_type = 'CLIP_EDITOR'
 
-    def draw(self, context):
+    def _draw_tracking(self, context):
         layout = self.layout
 
         sc = context.space_data
@@ -41,39 +41,37 @@
             if sc.view == 'CLIP':
                 if clip:
                     sub.menu("CLIP_MT_select")
+                    sub.menu("CLIP_MT_clip")
+                    sub.menu("CLIP_MT_track")
+                    sub.menu("CLIP_MT_reconstruction")
+                else:
+                    sub.menu("CLIP_MT_clip")
 
-                sub.menu("CLIP_MT_clip")
+        row = layout.row()
+        row.template_ID(sc, "clip", open='clip.open')
 
-                if clip:
-                    if sc.mode == 'MASKEDIT':
-                        sub.menu("CLIP_MT_mask")
-                    else:
-                        sub.menu("CLIP_MT_track")
-                        sub.menu("CLIP_MT_reconstruction")
+        if clip:
+            tracking = clip.tracking
+            active_object = tracking.objects.active
 
-        if sc.mode != 'MASKEDIT':
-            layout.prop(sc, "view", text="", expand=True)
-
-        if clip:
             if sc.view == 'CLIP':
                 layout.prop(sc, "mode", text="")
+                layout.prop(sc, "view", text="", expand=True)
                 layout.prop(sc, "pivot_point", text="", icon_only=True)
 
-                if sc.mode == 'MASKEDIT':
-                    toolsettings = context.tool_settings
+                r = active_object.reconstruction
 
-                    row = layout.row(align=True)
-                    row.prop(toolsettings, "use_proportional_edit_mask",
-                             text="", icon_only=True)
-                    if toolsettings.use_proportional_edit_objects:
-                        row.prop(toolsettings, "proportional_edit_falloff",
-                                 text="", icon_only=True)
+                if r.is_valid and sc.view == 'CLIP':
+                    layout.label(text="Average solve error: %.4f" %
+                                 (r.average_error))
             elif sc.view == 'GRAPH':
+                layout.prop(sc, "view", text="", expand=True)
+
                 row = layout.row(align=True)
 
                 if sc.show_filters:
                     row.prop(sc, "show_filters", icon='DISCLOSURE_TRI_DOWN',
-                        text="Filters")
+                             text="Filters")
 
                     sub = row.column()
                     sub.active = clip.tracking.reconstruction.is_valid
@@ -82,33 +80,64 @@
                     row.prop(sc, "show_graph_tracks", icon='ANIM', text="")
                 else:
                     row.prop(sc, "show_filters", icon='DISCLOSURE_TRI_RIGHT',
-                        text="Filters")
+                             text="Filters")

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list