Revision: 50113
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50113
Author: campbellbarton
Date: 2012-08-22 12:04:27 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r50107:50112
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50107
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/bvh/bvh.cpp
branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py
branches/soc-2011-tomato/release/scripts/templates/operator_mesh_add.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.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-50107
+
/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-50112
Modified: branches/soc-2011-tomato/intern/cycles/bvh/bvh.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/bvh/bvh.cpp 2012-08-22 11:58:59 UTC
(rev 50112)
+++ branches/soc-2011-tomato/intern/cycles/bvh/bvh.cpp 2012-08-22 12:04:27 UTC
(rev 50113)
@@ -411,7 +411,7 @@
size_t nsize_bbox = (use_qbvh)? nsize-2: nsize-1;
int4 *bvh_nodes = &bvh->pack.nodes[0];
size_t bvh_nodes_size = bvh->pack.nodes.size();
- int *bvh_is_leaf = &bvh->pack.is_leaf[0];
+ int *bvh_is_leaf = (bvh->pack.is_leaf.size() != 0) ?
&bvh->pack.is_leaf[0] : NULL;
for(size_t i = 0, j = 0; i < bvh_nodes_size; i+=nsize,
j++) {
memcpy(pack_nodes + pack_nodes_offset,
bvh_nodes + i, nsize_bbox*sizeof(int4));
@@ -419,7 +419,7 @@
/* modify offsets into arrays */
int4 data = bvh_nodes[i + nsize_bbox];
- if(bvh_is_leaf[j]) {
+ if(bvh_is_leaf && bvh_is_leaf[j]) {
data.x += tri_offset;
data.y += tri_offset;
}
Modified: branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
2012-08-22 11:58:59 UTC (rev 50112)
+++ branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
2012-08-22 12:04:27 UTC (rev 50113)
@@ -275,6 +275,7 @@
try:
mod.register()
except:
+ print("Exception in module register(): %r" % getattr(mod, "__file__",
module_name))
handle_error()
del sys.modules[module_name]
return None
@@ -316,6 +317,7 @@
try:
mod.unregister()
except:
+ print("Exception in module unregister(): %r" % getattr(mod,
"__file__", module_name))
import traceback
traceback.print_exc()
else:
Modified: branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py
2012-08-22 11:58:59 UTC (rev 50112)
+++ branches/soc-2011-tomato/release/scripts/modules/blend_render_info.py
2012-08-22 12:04:27 UTC (rev 50113)
@@ -86,6 +86,8 @@
scenes.append((start_frame, end_frame, scene_name))
+ blendfile.close()
+
return scenes
Modified:
branches/soc-2011-tomato/release/scripts/templates/operator_mesh_add.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/templates/operator_mesh_add.py
2012-08-22 11:58:59 UTC (rev 50112)
+++ branches/soc-2011-tomato/release/scripts/templates/operator_mesh_add.py
2012-08-22 12:04:27 UTC (rev 50113)
@@ -78,9 +78,9 @@
def execute(self, context):
verts_loc, faces = add_box(self.width,
- self.height,
- self.depth,
- )
+ self.height,
+ self.depth,
+ )
mesh = bpy.data.meshes.new("Box")
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-08-22 11:58:59 UTC (rev 50112)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-08-22 12:04:27 UTC (rev 50113)
@@ -158,7 +158,7 @@
mask->masklay_tot++;
- masklay->blend = MASK_BLEND_MERGE;
+ masklay->blend = MASK_BLEND_MERGE_ADD;
masklay->alpha = 1.0f;
return masklay;
Modified:
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
2012-08-22 11:58:59 UTC (rev 50112)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
2012-08-22 12:04:27 UTC (rev 50113)
@@ -1282,9 +1282,12 @@
}
switch (layer->blend) {
- case MASK_BLEND_MERGE:
+ case MASK_BLEND_MERGE_ADD:
value += value_layer * (1.0f - value);
break;
+ case MASK_BLEND_MERGE_SUBTRACT:
+ value -= value_layer * value;
+ break;
case MASK_BLEND_ADD:
value += value_layer;
break;
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-50107
+ /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-50112
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-50107
+
/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-50112
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
2012-08-22 11:58:59 UTC (rev 50112)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
2012-08-22 12:04:27 UTC (rev 50113)
@@ -87,21 +87,23 @@
short split_tag, dupe_tag;
} BevPoint;
-/* Keyframes on F-Curves (allows code reuse of Bezier eval code) and
+/**
+ * Keyframes on F-Curves (allows code reuse of Bezier eval code) and
* Points on Bezier Curves/Paths are generally BezTriples
+ *
+ * \note alfa location in struct is abused by Key system
+ *
+ * \note vec in BezTriple looks like this:
+ * - vec[0][0] = x location of handle 1
+ * - vec[0][1] = y location of handle 1
+ * - vec[0][2] = z location of handle 1 (not used for FCurve Points(2d))
+ * - vec[1][0] = x location of control point
+ * - vec[1][1] = y location of control point
+ * - vec[1][2] = z location of control point
+ * - vec[2][0] = x location of handle 2
+ * - vec[2][1] = y location of handle 2
+ * - vec[2][2] = z location of handle 2 (not used for FCurve Points(2d))
*/
-/* note: alfa location in struct is abused by Key system */
-/* vec in BezTriple looks like this:
- * - vec[0][0]=x location of handle 1
- * - vec[0][1]=y location of handle 1
- * - vec[0][2]=z location of handle 1 (not used for FCurve Points(2d))
- * - vec[1][0]=x location of control point
- * - vec[1][1]=y location of control point
- * - vec[1][2]=z location of control point
- * - vec[2][0]=x location of handle 2
- * - vec[2][1]=y location of handle 2
- * - vec[2][2]=z location of handle 2 (not used for FCurve Points(2d))
- */
typedef struct BezTriple {
float vec[3][3];
float alfa, weight, radius; /* alfa: tilt in 3D View, weight: used
for softbody goal weight, radius: for bevel tapering */
@@ -119,6 +121,10 @@
float radius, pad; /* user-set radius per point for
beveling etc */
} BPoint;
+/**
+ * \note Nurb name is misleading, since it can be used for polygons too,
+ * also, it should be NURBS (Nurb isn't the singular of Nurbs).
+ */
typedef struct Nurb {
struct Nurb *next, *prev; /* multiple nurbs per curve object are
allowed */
short type;
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
2012-08-22 11:58:59 UTC (rev 50112)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
2012-08-22 12:04:27 UTC (rev 50113)
@@ -168,14 +168,15 @@
/* masklay->blend */
enum {
- MASK_BLEND_ADD = 0,
- MASK_BLEND_SUBTRACT = 1,
- MASK_BLEND_LIGHTEN = 2,
- MASK_BLEND_DARKEN = 3,
- MASK_BLEND_MUL = 4,
- MASK_BLEND_REPLACE = 5,
- MASK_BLEND_DIFFERENCE = 6,
- MASK_BLEND_MERGE = 7
+ MASK_BLEND_ADD = 0,
+ MASK_BLEND_SUBTRACT = 1,
+ MASK_BLEND_LIGHTEN = 2,
+ MASK_BLEND_DARKEN = 3,
+ MASK_BLEND_MUL = 4,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
