Revision: 49624
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49624
Author: nazgul
Date: 2012-08-06 15:22:19 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
Merging r49622 through r49623 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49622
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49623
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.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-49620
+
/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-49623
Modified:
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_mask_common.py
===================================================================
---
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_mask_common.py
2012-08-06 15:20:14 UTC (rev 49623)
+++
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_mask_common.py
2012-08-06 15:22:19 UTC (rev 49624)
@@ -127,7 +127,9 @@
row.prop(spline, "use_cyclic")
row.prop(spline, "use_fill")
+ col.prop(spline, "use_self_intersection_check")
+
class MASK_PT_point():
# subclasses must define...
#~ bl_space_type = 'CLIP_EDITOR'
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-08-06 15:20:14 UTC (rev 49623)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-08-06 15:22:19 UTC (rev 49624)
@@ -779,7 +779,8 @@
*tot_feather_point = tot;
- spline_feather_collapse_inner_loops(spline, feather, tot);
+ if (spline->flag & MASK_SPLINE_NOINTERSECT)
+ spline_feather_collapse_inner_loops(spline, feather, tot);
return feather;
}
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-49620
+ /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-49623
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-49620
+
/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-49623
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-06 15:20:14 UTC (rev 49623)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
2012-08-06 15:22:19 UTC (rev 49624)
@@ -144,7 +144,8 @@
/* reserve (1 << 0) for SELECT */
enum {
MASK_SPLINE_CYCLIC = (1 << 1),
- MASK_SPLINE_NOFILL = (1 << 2)
+ MASK_SPLINE_NOFILL = (1 << 2),
+ MASK_SPLINE_NOINTERSECT = (1 << 3)
};
/* MaskSpline->weight_interp */
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
2012-08-06 15:20:14 UTC (rev 49623)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
2012-08-06 15:22:19 UTC (rev 49624)
@@ -568,6 +568,13 @@
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag",
MASK_SPLINE_NOFILL);
RNA_def_property_ui_text(prop, "Fill", "Make this spline filled");
RNA_def_property_update(prop, NC_MASK | NA_EDITED,
"rna_Mask_update_data");
+
+ /* self-intersection check */
+ prop = RNA_def_property(srna, "use_self_intersection_check",
PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag",
MASK_SPLINE_NOINTERSECT);
+ RNA_def_property_ui_text(prop, "Self Intersection Check", "Prevent
feather from self-intersections");
+ RNA_def_property_update(prop, NC_MASK | NA_EDITED,
"rna_Mask_update_data");
}
static void rna_def_mask_layer(BlenderRNA *brna)
Modified: branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
2012-08-06 15:20:14 UTC (rev 49623)
+++ branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
2012-08-06 15:22:19 UTC (rev 49624)
@@ -2007,13 +2007,21 @@
/* could be done a lot more nicely, but for now a quick way to get
bge.* working */
PyRun_SimpleString("sys = __import__('sys');"
- "mod = sys.modules['bge'] = type(sys)('bge');"
-
"mod.__dict__.update({'logic':__import__('GameLogic'), "
+ "bge = type(sys)('bge');"
+
"bge.__dict__.update({'logic':__import__('GameLogic'), "
"'render':__import__('Rasterizer'), "
"'events':__import__('GameKeys'), "
"'constraints':__import__('PhysicsConstraints'), "
"'types':__import__('GameTypes'), "
"'texture':__import__('VideoTexture')});"
+ /* so we can do 'import bge.foo as bar' */
+ "sys.modules.update({'bge': bge, "
+ "'bge.logic':bge.logic, "
+ "'bge.render':bge.render, "
+ "'bge.events':bge.events, "
+
"'bge.constraints':bge.constraints, "
+ "'bge.types':bge.types, "
+ "'bge.texture':bge.texture})"
);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
