[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41597] branches/soc-2011-tomato: Merging r41564 through r41596 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Sun Nov 6 19:38:21 CET 2011
Revision: 41597
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41597
Author: nazgul
Date: 2011-11-06 18:38:20 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Merging r41564 through r41596 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41564
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41596
Modified Paths:
--------------
branches/soc-2011-tomato/GNUmakefile
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/graph.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.h
branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-tomato/source/blender/editors/include/ED_particle.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_object.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.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/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/render/intern/include/zbuf.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-tomato/source/blender/render/intern/source/sss.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureActuator.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2011-tomato/source/gameengine/Expressions/Expression.h
branches/soc-2011-tomato/source/gameengine/Expressions/ListValue.h
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-tomato/source/gameengine/Expressions/Value.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/Value.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ANDController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_NANDController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_NORController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ORController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_XNORController.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_XORController.h
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_StateActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VertexProxy.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VisibilityActuator.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:externals
- po https://svn.blender.org/svnroot/bf-translations/trunk/po
+
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41563
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41596
Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile 2011-11-06 16:38:21 UTC (rev 41596)
+++ branches/soc-2011-tomato/GNUmakefile 2011-11-06 18:38:20 UTC (rev 41597)
@@ -135,9 +135,6 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Other Targets (not assosiated with building blender)"
- @echo " * translations - update blenders translation files in po/"
- @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -171,16 +168,6 @@
# -----------------------------------------------------------------------------
-# Other Targets
-#
-translations:
- $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/tools/update_msg.py
- python3 po/tools/update_pot.py
- python3 po/tools/update_po.py
- python3 po/tools/update_mo.py
-
-
-# -----------------------------------------------------------------------------
# Tests
#
test:
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 2011-11-06 16:38:21 UTC (rev 41596)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py 2011-11-06 18:38:20 UTC (rev 41597)
@@ -257,10 +257,8 @@
layout.prop(ob, "dupli_group", text="Group")
-# XXX: the following options are all quite buggy, ancient hacks that should be dropped
-
-class OBJECT_PT_animation(ObjectButtonsPanel, Panel):
- bl_label = "Animation Hacks"
+class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel):
+ bl_label = "Relations Extras"
bl_options = {'DEFAULT_CLOSED'}
def draw(self, context):
@@ -269,23 +267,17 @@
ob = context.object
split = layout.split()
-
+
col = split.column()
- col.label(text="Time Offset:")
- col.prop(ob, "use_time_offset_edit", text="Edit")
- row = col.row()
- row.prop(ob, "use_time_offset_parent", text="Parent")
- row.active = (ob.parent is not None)
- row = col.row()
- row.prop(ob, "use_slow_parent")
- row.active = (ob.parent is not None)
- col.prop(ob, "time_offset", text="Offset")
-
- # XXX: these are still used for a few curve-related tracking features
- col = split.column()
col.label(text="Tracking Axes:")
col.prop(ob, "track_axis", text="Axis")
col.prop(ob, "up_axis", text="Up Axis")
+
+ col = split.column()
+ col.prop(ob, "use_slow_parent")
+ row = col.row()
+ row.active = ((ob.parent is not None) and (ob.use_slow_parent))
+ row.prop(ob, "slow_parent_offset", text="Offset")
from bl_ui.properties_animviz import (
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py 2011-11-06 16:38:21 UTC (rev 41596)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py 2011-11-06 18:38:20 UTC (rev 41597)
@@ -2063,9 +2063,24 @@
subcol.label(text="Local Camera:")
subcol.prop(view, "camera", text="")
- layout.column().prop(view, "cursor_location")
+class VIEW3D_PT_view3d_cursor(Panel):
+ bl_space_type = 'VIEW_3D'
+ bl_region_type = 'UI'
+ bl_label = "3D Cursor"
+ @classmethod
+ def poll(cls, context):
+ view = context.space_data
+ return (view)
+
+ def draw(self, context):
+ layout = self.layout
+
+ view = context.space_data
+ layout.column().prop(view, "cursor_location", text="Location")
+
+
class VIEW3D_PT_view3d_name(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_effect.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_effect.h 2011-11-06 16:38:21 UTC (rev 41596)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_effect.h 2011-11-06 18:38:20 UTC (rev 41597)
@@ -129,7 +129,7 @@
/* needed for boids */
float effector_falloff(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, struct EffectorWeights *weights);
-int closest_point_on_surface(struct SurfaceModifierData *surmd, float *co, float *surface_co, float *surface_nor, float *surface_vel);
+int closest_point_on_surface(SurfaceModifierData *surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]);
int get_effector_data(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, int real_velocity);
/* required for particle_system.c */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h 2011-11-06 16:38:21 UTC (rev 41596)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h 2011-11-06 18:38:20 UTC (rev 41597)
@@ -87,7 +87,6 @@
void set_field_offs(float field);
void disable_speed_curve(int val);
-float bsystem_time(struct Scene *scene, struct Object *ob, float cfra, float ofs);
void object_scale_to_mat3(struct Object *ob, float mat[][3]);
void object_rot_to_mat3(struct Object *ob, float mat[][3]);
void object_mat3_to_rot(struct Object *ob, float mat[][3], short use_compat);
@@ -109,7 +108,7 @@
void object_get_dimensions(struct Object *ob, float *value);
void object_set_dimensions(struct Object *ob, const float *value);
void object_boundbox_flag(struct Object *ob, int flag, int set);
-void minmax_object(struct Object *ob, float *min, float *max);
+void minmax_object(struct Object *ob, float min[3], float max[3]);
int minmax_object_duplis(struct Scene *scene, struct Object *ob, float *min, float *max);
void solve_tracking (struct Object *ob, float targetmat[][4]);
int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3]);
@@ -120,7 +119,6 @@
void object_handle_update(struct Scene *scene, struct Object *ob);
void object_sculpt_modifiers_changed(struct Object *ob);
-float give_timeoffset(struct Object *ob);
int give_obdata_texspace(struct Object *ob, short **texflag, float **loc, float **size, float **rot);
int object_insert_ptcache(struct Object *ob);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h 2011-11-06 16:38:21 UTC (rev 41596)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h 2011-11-06 18:38:20 UTC (rev 41597)
@@ -254,8 +254,8 @@
int psys_render_simplify_distribution(struct ParticleThreadContext *ctx, int tot);
int psys_render_simplify_params(struct ParticleSystem *psys, struct ChildParticle *cpa, float *params);
-void psys_interpolate_uvs(struct MTFace *tface, int quad, float *uv, float *uvco);
-void psys_interpolate_mcol(struct MCol *mcol, int quad, float *uv, struct MCol *mc);
+void psys_interpolate_uvs(const struct MTFace *tface, int quad, const float w[4], float uvco[2]);
+void psys_interpolate_mcol(const struct MCol *mcol, int quad, const float w[4], struct MCol *mc);
void copy_particle_key(struct ParticleKey *to, struct ParticleKey *from, int time);
@@ -335,12 +335,12 @@
/* BLI_bvhtree_ray_cast callback */
void BKE_psys_collision_neartest_cb(void *userdata, int index, const struct BVHTreeRay *ray, struct BVHTreeRayHit *hit);
-void psys_particle_on_dm(struct DerivedMesh *dm, int from, int index, int index_dmcache, float *fw, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor);
+void psys_particle_on_dm(struct DerivedMesh *dm, int from, int index, int index_dmcache, const float fw[4], float foffset, float vec[3], float nor[3], float utan[3], float vtan[3], float orco[3], float ornor[3]);
/* particle_system.c */
void initialize_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, int p);
void psys_calc_dmcache(struct Object *ob, struct DerivedMesh *dm, struct ParticleSystem *psys);
-int psys_particle_dm_face_lookup(struct Object *ob, struct DerivedMesh *dm, int index, float *fw, struct LinkNode *node);
+int psys_particle_dm_face_lookup(struct Object *ob, struct DerivedMesh *dm, int index, const float fw[4], struct LinkNode *node);
void reset_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, float dtime, float cfra);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h 2011-11-06 16:38:21 UTC (rev 41596)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h 2011-11-06 18:38:20 UTC (rev 41597)
@@ -86,6 +86,7 @@
int scene_check_setscene(struct Main *bmain, struct Scene *sce);
float BKE_curframe(struct Scene *scene);
+float BKE_frame_to_ctime(struct Scene *scene, const float frame);
void scene_update_tagged(struct Main *bmain, struct Scene *sce);
void scene_clear_tagged(struct Main *bmain, struct Scene *sce);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c 2011-11-06 16:38:21 UTC (rev 41596)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list