[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57917] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Tue Jul 2 00:33:43 CEST 2013
Revision: 57917
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57917
Author: gdh
Date: 2013-07-01 22:33:42 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r57592 to r57908.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57592
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57908
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_object.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/library.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2013-cycles_mblur/source/blender/editors/animation/keyframing.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_draw.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57879
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57916
Modified: branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-07-01 21:56:59 UTC (rev 57916)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-07-01 22:33:42 UTC (rev 57917)
@@ -1142,6 +1142,9 @@
fi
_with_built_openexr=true
+
+ # Just always run it, much simpler this way!
+ _need_openexr_ldconfig=true
}
#### Build OIIO ####
@@ -3135,6 +3138,9 @@
if [ $_need_oiio_ldconfig == true ]; then
sudo sh -c "echo \"$INST/oiio/lib\" > /etc/ld.so.conf.d/oiio.conf"
fi
+if [ $_need_openexr_ldconfig == true ]; then
+ sudo sh -c "echo \"$INST/openexr/lib\" > /etc/ld.so.conf.d/openexr.conf"
+fi
sudo /sbin/ldconfig # XXX OpenSuse does not include sbin in command path with sudo!!!
INFO ""
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py 2013-07-01 21:56:59 UTC (rev 57916)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/node.py 2013-07-01 22:33:42 UTC (rev 57917)
@@ -66,12 +66,8 @@
# convert mouse position to the View2D for later node placement
if context.region.type == 'WINDOW':
- # XXX, why use DPI for coords?
- dpi_fac = context.user_preferences.system.dpi / 72.0
space.cursor_location = v2d.region_to_view(event.mouse_region_x,
event.mouse_region_y)
- space.cursor_location /= dpi_fac
-
else:
space.cursor_location = tree.view_center
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_mesh.py 2013-07-01 21:56:59 UTC (rev 57916)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_mesh.py 2013-07-01 22:33:42 UTC (rev 57917)
@@ -215,7 +215,7 @@
row = layout.row()
sub = row.row(align=True)
- sub.operator("object.vertex_group_assign", text="Assign").new = False
+ sub.operator("object.vertex_group_assign", text="Assign")
sub.operator("object.vertex_group_remove_from", text="Remove")
sub = row.row(align=True)
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-01 21:56:59 UTC (rev 57916)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-01 22:33:42 UTC (rev 57917)
@@ -1310,13 +1310,13 @@
layout = self.layout
layout.operator_context = 'EXEC_AREA'
- layout.operator("object.vertex_group_assign", text="Assign to New Group").new = True
+ layout.operator("object.vertex_group_assign_new")
ob = context.active_object
if ob.mode == 'EDIT' or (ob.mode == 'WEIGHT_PAINT' and ob.type == 'MESH' and ob.data.use_paint_mask_vertex):
if ob.vertex_groups.active:
layout.separator()
- layout.operator("object.vertex_group_assign", text="Assign to Active Group").new = False
+ layout.operator("object.vertex_group_assign", text="Assign to Active Group")
layout.operator("object.vertex_group_remove_from", text="Remove from Active Group").use_all_groups = False
layout.operator("object.vertex_group_remove_from", text="Remove from All").use_all_groups = True
layout.separator()
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_object.h 2013-07-01 21:56:59 UTC (rev 57916)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_object.h 2013-07-01 22:33:42 UTC (rev 57917)
@@ -79,6 +79,8 @@
void BKE_object_unlink(struct Object *ob);
bool BKE_object_exists_check(struct Object *obtest);
bool BKE_object_is_in_editmode(struct Object *ob);
+bool BKE_object_is_in_editmode_vgroup(struct Object *ob);
+bool BKE_object_is_in_wpaint_select_vert(struct Object *ob);
struct Object *BKE_object_add_only_object(struct Main *bmain, int type, const char *name);
struct Object *BKE_object_add(struct Main *bmain, struct Scene *scene, int type);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-01 21:56:59 UTC (rev 57916)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-01 22:33:42 UTC (rev 57917)
@@ -2009,9 +2009,9 @@
DerivedMesh **final_r,
CustomDataMask dataMask)
{
- ModifierData *md;
+ ModifierData *md, *previewmd = NULL;
float (*deformedVerts)[3] = NULL;
- CustomDataMask mask;
+ CustomDataMask mask, previewmask = 0;
DerivedMesh *dm, *orcodm = NULL;
int i, numVerts = 0, cageIndex = modifiers_getCageIndex(scene, ob, NULL, 1);
CDMaskLink *datamasks, *curr;
@@ -2025,6 +2025,7 @@
const int do_final_wmcol = FALSE;
int do_init_wmcol = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) && !do_final_wmcol);
int do_init_statvis = ((((Mesh *)ob->data)->drawflag & ME_DRAW_STATVIS) && !do_init_wmcol);
+ const int do_mod_wmcol = do_init_wmcol;
modifiers_clearErrors(ob);
@@ -2035,8 +2036,19 @@
dm = NULL;
md = modifiers_getVirtualModifierList(ob);
- datamasks = modifiers_calcDataMasks(scene, ob, md, dataMask, required_mode, NULL, 0);
+ /* copied from mesh_calc_modifiers */
+ if (do_mod_wmcol) {
+ previewmd = modifiers_getLastPreview(scene, md, required_mode);
+ /* even if the modifier doesn't need the data, to make a preview it may */
+ if (previewmd) {
+ if (do_mod_wmcol) {
+ previewmask = CD_MASK_MDEFORMVERT;
+ }
+ }
+ }
+ datamasks = modifiers_calcDataMasks(scene, ob, md, dataMask, required_mode, previewmd, previewmask);
+
curr = datamasks;
for (i = 0; md; i++, md = md->next, curr = curr->next) {
ModifierTypeInfo *mti = modifierType_getInfo(md->type);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c 2013-07-01 21:56:59 UTC (rev 57916)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c 2013-07-01 22:33:42 UTC (rev 57917)
@@ -1639,8 +1639,46 @@
return NULL;
}
+/* initialise default value for NlaEvalChannel, so that it doesn't blend things wrong */
+static void nlaevalchan_value_init(NlaEvalChannel *nec)
+{
+ PointerRNA *ptr = &nec->ptr;
+ PropertyRNA *prop = nec->prop;
+ int index = nec->index;
+
+ /* NOTE: while this doesn't work for all RNA properties as default values aren't in fact
+ * set properly for most of them, at least the common ones (which also happen to get used
+ * in NLA strips a lot, e.g. scale) are set correctly.
+ */
+ switch (RNA_property_type(prop)) {
+ case PROP_BOOLEAN:
+ if (RNA_property_array_length(ptr, prop))
+ nec->value = (float)RNA_property_boolean_get_default_index(ptr, prop, index);
+ else
+ nec->value = (float)RNA_property_boolean_get_default(ptr, prop);
+ break;
+ case PROP_INT:
+ if (RNA_property_array_length(ptr, prop))
+ nec->value = (float)RNA_property_int_get_default_index(ptr, prop, index);
+ else
+ nec->value = (float)RNA_property_int_get_default(ptr, prop);
+ break;
+ case PROP_FLOAT:
+ if (RNA_property_array_length(ptr, prop))
+ nec->value = RNA_property_float_get_default_index(ptr, prop, index);
+ else
+ nec->value = RNA_property_float_get_default(ptr, prop);
+ break;
+ case PROP_ENUM:
+ nec->value = (float)RNA_property_enum_get_default(ptr, prop);
+ break;
+ default:
+ break;
+ }
+}
+
/* verify that an appropriate NlaEvalChannel for this F-Curve exists */
-static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, NlaEvalStrip *nes, FCurve *fcu, short *newChan)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list