[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48575] branches/soc-2011-tomato: Merging r48545 through r48574 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jul 4 09:33:34 CEST 2012
Revision: 48575
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48575
Author: nazgul
Date: 2012-07-04 07:33:34 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Merging r48545 through r48574 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48545
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48574
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-tomato/release/scripts/templates/operator_node.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_intern.h
branches/soc-2011-tomato/source/blender/editors/armature/armature_ops.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2011-tomato/source/blender/imbuf/intern/jp2.c
branches/soc-2011-tomato/source/blender/imbuf/intern/tiff.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_armature_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_socket.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.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-48544
+ /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-48574
Modified: branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst 2012-07-04 07:33:34 UTC (rev 48575)
@@ -3574,7 +3574,7 @@
Gets the normal vector of this vertex.
- :return: normalised normal vector.
+ :return: normalized normal vector.
:rtype: list [nx, ny, nz]
.. method:: setNormal(normal)
Modified: branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/bl_process_msg.py 2012-07-04 07:33:34 UTC (rev 48575)
@@ -24,9 +24,8 @@
import os
-# Quite an ugly hack… But the simplest solution for now!
-#import sys
-#sys.path.append(os.path.abspath(os.path.dirname(__file__)))
+# XXX Relative import does not work here when used from Blender...
+#from . import settings
import bl_i18n_utils.settings as settings
Modified: branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2012-07-04 07:33:34 UTC (rev 48575)
@@ -165,6 +165,7 @@
"workflow",
# Neologisms, slangs
+ "affectable",
"automagic", "automagically",
"blobby",
"blockiness", "blocky",
@@ -330,6 +331,7 @@
"dupliobject", "dupliob",
"dupligroup",
"duplivert",
+ "editbone",
"fcurve", "fcurves",
"fluidsim",
"frameserver",
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/io_utils.py 2012-07-04 07:33:34 UTC (rev 48575)
@@ -330,7 +330,7 @@
description="Method used to reference paths",
items=(('AUTO', "Auto", "Use Relative paths with subdirectories only"),
('ABSOLUTE', "Absolute", "Always write absolute paths"),
- ('RELATIVE', "Relative", "Always write relative patsh "
+ ('RELATIVE', "Relative", "Always write relative paths "
"(where possible)"),
('MATCH', "Match", "Match Absolute/Relative "
"setting with input path"),
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py 2012-07-04 07:33:34 UTC (rev 48575)
@@ -203,7 +203,7 @@
col.operator("poselib.pose_remove", icon='ZOOMOUT', text="")
col.operator("poselib.apply_pose", icon='ZOOM_SELECTED', text="").pose_index = poselib.pose_markers.active_index
- col.operator("poselib.action_sanitise", icon='HELP', text="") # XXX: put in menu?
+ col.operator("poselib.action_sanitize", icon='HELP', text="") # XXX: put in menu?
# properties for active marker
if pose_marker_active is not None:
@@ -304,7 +304,7 @@
layout = self.layout
ob = context.object
- avs = ob.pose.animation_visualisation
+ avs = ob.pose.animation_visualization
pchan = context.active_pose_bone
mpath = pchan.motion_path if pchan else None
@@ -323,7 +323,7 @@
def draw(self, context):
ob = context.object
- self.draw_settings(context, ob.pose.animation_visualisation, bones=True)
+ self.draw_settings(context, ob.pose.animation_visualization, bones=True)
class DATA_PT_custom_props_arm(ArmatureButtonsPanel, PropertyPanel, Panel):
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py 2012-07-04 07:33:34 UTC (rev 48575)
@@ -309,7 +309,7 @@
layout = self.layout
ob = context.object
- avs = ob.animation_visualisation
+ avs = ob.animation_visualization
mpath = ob.motion_path
self.draw_settings(context, avs, mpath)
@@ -326,7 +326,7 @@
def draw(self, context):
ob = context.object
- self.draw_settings(context, ob.animation_visualisation)
+ self.draw_settings(context, ob.animation_visualization)
class OBJECT_PT_custom_props(ObjectButtonsPanel, PropertyPanel, Panel):
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py 2012-07-04 07:33:34 UTC (rev 48575)
@@ -195,7 +195,7 @@
col = split.column()
col.label(text="Particle:")
col.prop(settings, "permeability", slider=True)
- col.prop(settings, "stickness")
+ col.prop(settings, "stickiness")
col.prop(settings, "use_particle_kill")
col.label(text="Particle Damping:")
sub = col.column(align=True)
Modified: branches/soc-2011-tomato/release/scripts/templates/operator_node.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/templates/operator_node.py 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/release/scripts/templates/operator_node.py 2012-07-04 07:33:34 UTC (rev 48575)
@@ -1,7 +1,7 @@
import bpy
-def main(operator, context):
+def main(context):
space = context.space_data
node_tree = space.node_tree
node_active = context.active_node
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_anim.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_anim.h 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_anim.h 2012-07-04 07:33:34 UTC (rev 48575)
@@ -43,7 +43,7 @@
struct ReportList;
/* ---------------------------------------------------- */
-/* Animation Visualisation */
+/* Animation Visualization */
void animviz_settings_init(struct bAnimVizSettings *avs);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2012-07-04 07:33:34 UTC (rev 48575)
@@ -27,6 +27,7 @@
#ifndef __BKE_MASK_H__
#define __BKE_MASK_H__
+struct ListBase;
struct Main;
struct Mask;
struct MaskParent;
@@ -50,12 +51,16 @@
void BKE_mask_layer_free_shapes(struct MaskLayer *masklay);
void BKE_mask_layer_free(struct MaskLayer *masklay);
+void BKE_mask_layer_free_list(struct ListBase *masklayers);
void BKE_mask_spline_free(struct MaskSpline *spline);
struct MaskSpline *BKE_mask_spline_copy(struct MaskSpline *spline);
void BKE_mask_point_free(struct MaskSplinePoint *point);
void BKE_mask_layer_unique_name(struct Mask *mask, struct MaskLayer *masklay);
+struct MaskLayer *BKE_mask_layer_copy(struct MaskLayer *layer);
+void BKE_mask_layer_copy_list(struct ListBase *masklayers_new, struct ListBase *masklayers);
+
/* splines */
struct MaskSpline *BKE_mask_spline_add(struct MaskLayer *masklay);
@@ -170,6 +175,11 @@
/* rasterization */
int BKE_mask_get_duration(struct Mask *mask);
+
+void BKE_mask_rasterize_layers(struct Mask *mask, struct ListBase *masklayers, int width, int height, float *buffer,
+ const short do_aspect_correct, const short do_mask_aa,
+ const short do_feather);
+
void BKE_mask_rasterize(struct Mask *mask, int width, int height, float *buffer,
const short do_aspect_correct, const short do_mask_aa,
const short do_feather);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c 2012-07-04 07:10:23 UTC (rev 48574)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c 2012-07-04 07:33:34 UTC (rev 48575)
@@ -78,9 +78,9 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list