[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38712] branches/bmesh/blender: svn merge -r38200:38300 https://svn.blender.org/svnroot/bf-blender/trunk/ blender, source/blender/gpu/intern/gpu_buffers. c updated from trunk and re-made edits to use getTessFace* functions.

Campbell Barton ideasman42 at gmail.com
Tue Jul 26 05:00:55 CEST 2011 

Revision: 38712
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38712
Author:   campbellbarton
Date:     2011-07-26 03:00:55 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
svn merge -r38200:38300 https://svn.blender.org/svnroot/bf-blender/trunk/blender, source/blender/gpu/intern/gpu_buffers.c updated from trunk and re-made edits to use getTessFace* functions.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38200

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py
    branches/bmesh/blender/doc/python_api/examples/blf.py
    branches/bmesh/blender/doc/python_api/examples/bpy.types.RenderEngine.py
    branches/bmesh/blender/doc/python_api/rst/bge.events.rst
    branches/bmesh/blender/doc/python_api/rst/bge.texture.rst
    branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
    branches/bmesh/blender/intern/ghost/test/multitest/MultiTest.c
    branches/bmesh/blender/intern/iksolver/intern/IK_QJacobian.cpp
    branches/bmesh/blender/intern/iksolver/intern/IK_QJacobian.h
    branches/bmesh/blender/intern/iksolver/intern/IK_QTask.cpp
    branches/bmesh/blender/release/scripts/modules/addon_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy/ops.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_types.py
    branches/bmesh/blender/release/scripts/modules/bpyml_ui.py
    branches/bmesh/blender/release/scripts/modules/rna_prop_ui.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/object_align.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_animviz.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/bmesh/blender/release/scripts/startup/keyingsets_builtins.py
    branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
    branches/bmesh/blender/source/blender/blenkernel/intern/material.c
    branches/bmesh/blender/source/blender/blenkernel/intern/node.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
    branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
    branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
    branches/bmesh/blender/source/blender/editors/armature/poseUtils.c
    branches/bmesh/blender/source/blender/editors/object/object_relations.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/gpu/GPU_buffers.h
    branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
    branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_cast.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_hook.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_smooth.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.h
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_warp.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_wave.c
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
    branches/bmesh/blender/source/blender/python/generic/py_capi_utils.h
    branches/bmesh/blender/source/blender/python/intern/bpy_driver.c
    branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
    branches/bmesh/blender/source/creator/creator.c
    branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Camera.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp

Added Paths:
-----------
    branches/bmesh/blender/doc/python_api/examples/bge.constraints.py
    branches/bmesh/blender/doc/python_api/rst/bge.constraints.rst

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
    branches/bmesh/blender/source/blender/editors/render/render_update.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:31524-38200
   + /trunk/blender:31524-38300

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2011-07-26 02:35:46 UTC (rev 38711)
+++ branches/bmesh/blender/CMakeLists.txt	2011-07-26 03:00:55 UTC (rev 38712)
@@ -789,11 +789,8 @@
 		if(WITH_IMAGE_OPENEXR)
 			set(OPENEXR ${LIBDIR}/gcc/openexr)
 			set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
-			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread)
+			set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
 			set(OPENEXR_LIBPATH ${OPENEXR}/lib)
-
-			# TODO, gives linking errors, force off
-			set(WITH_IMAGE_OPENEXR OFF)
 		endif()
 
 		if(WITH_IMAGE_TIFF)

Copied: branches/bmesh/blender/doc/python_api/examples/bge.constraints.py (from rev 38300, trunk/blender/doc/python_api/examples/bge.constraints.py)
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bge.constraints.py	                        (rev 0)
+++ branches/bmesh/blender/doc/python_api/examples/bge.constraints.py	2011-07-26 03:00:55 UTC (rev 38712)
@@ -0,0 +1,37 @@
+"""
+Basic Physics Constraint
+++++++++++++++++++++++
+Example of how to create a hinge Physics Constraint between two objects.
+"""
+from bge import logic
+from bge import constraints
+
+# get object list
+objects = logic.getCurrentScene().objects
+ 
+# get object named Object1 and Object 2
+object_1 = objects["Object1"]
+object_2 = objects["Object2"]
+ 
+# want to use Edge constraint type
+constraint_type = 2
+
+# get Object1 and Object2 physics IDs
+physics_id_1 = object_1.getPhysicsId()
+physics_id_2 = object_2.getPhysicsId()
+
+# Use bottom right edge of Object1 for hinge position
+edge_position_x = 1.0
+edge_position_y = 0.0
+edge_position_z = -1.0
+
+# use Object1 y axis for angle to point hinge
+edge_angle_x = 0.0
+edge_angle_y = 1.0
+edge_angle_z = 0.0
+
+# create an edge constraint
+constraints.createConstraint( physics_id_1, physics_id_2,
+                              constraint_type,
+                              edge_position_x, edge_position_y, edge_position_z,
+                              edge_angle_x, edge_angle_y, edge_angle_z )

Modified: branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py	2011-07-26 02:35:46 UTC (rev 38711)
+++ branches/bmesh/blender/doc/python_api/examples/bge.texture.1.py	2011-07-26 03:00:55 UTC (rev 38712)
@@ -5,7 +5,6 @@
 createTexture() and removeTexture() are to be called from a module Python
 Controller.
 """
-import bge
 from bge import logic
 from bge import texture	
 
@@ -14,7 +13,7 @@
     object = cont.owner
 	
     # get the reference pointer (ID) of the internal texture
-    ID = VT.materialID(obj, 'IMoriginal.png')
+    ID = texture.materialID(obj, 'IMoriginal.png')
 	
     # create a texture object 
     object_texture = texture.Texture(object, ID)

Modified: branches/bmesh/blender/doc/python_api/examples/blf.py
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/blf.py	2011-07-26 02:35:46 UTC (rev 38711)
+++ branches/bmesh/blender/doc/python_api/examples/blf.py	2011-07-26 03:00:55 UTC (rev 38712)
@@ -5,7 +5,6 @@
 need to use the OpenGL wrapper :class:`~bgl` as well.
 """
 # import game engine modules
-import bge
 from bge import render
 from bge import logic
 # import stand alone modules

Modified: branches/bmesh/blender/doc/python_api/examples/bpy.types.RenderEngine.py
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bpy.types.RenderEngine.py	2011-07-26 02:35:46 UTC (rev 38711)
+++ branches/bmesh/blender/doc/python_api/examples/bpy.types.RenderEngine.py	2011-07-26 03:00:55 UTC (rev 38712)
@@ -61,10 +61,10 @@
 # Otherwise most of the UI will be empty when the engine is selected.
 # In this example, we need to see the main render image button and
 # the material preview panel.
-import properties_render
+from bl_ui import properties_render
 properties_render.RENDER_PT_render.COMPAT_ENGINES.add('custom_renderer')
 del properties_render
 
-import properties_material
+from bl_ui import properties_material
 properties_material.MATERIAL_PT_preview.COMPAT_ENGINES.add('custom_renderer')
 del properties_material

Copied: branches/bmesh/blender/doc/python_api/rst/bge.constraints.rst (from rev 38300, trunk/blender/doc/python_api/rst/bge.constraints.rst)
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.constraints.rst	                        (rev 0)
+++ branches/bmesh/blender/doc/python_api/rst/bge.constraints.rst	2011-07-26 03:00:55 UTC (rev 38712)
@@ -0,0 +1,199 @@
+
+Game Engine bge.constraints Module
+==================================
+
+.. note::
+   This documentation is still very weak, and needs some help!
+
+.. function:: createConstraint([obj1, [obj2, [restLength, [restitution, [damping]]]]])
+
+   Creates a constraint.
+
+   :arg obj1: first object on Constraint
+   :type obj1: :class:'bge.types.KX_GameObject' #I think, there is no error when I use one
+
+   :arg obj2: second object on Constraint
+   :type obj2: :class:'bge.types.KX_GameObject' #too
+
+   :arg restLength: #to be filled
+   :type restLength: float
+
+   :arg restitution: #to be filled
+   :type restitution: float
+
+   :arg damping: #to be filled
+   :type damping: float
+
+.. attribute:: error
+
+   Simbolic constant string that indicates error.
+
+.. function:: exportBulletFile(filename)
+
+   export a .bullet file
+
+   :arg filename: File name
+   :type filename: string
+
+.. function:: getAppliedImpulse(constraintId)
+
+   :arg constraintId: The id of the constraint.
+   :type constraintId: int
+
+   :return: the most recent applied impulse.
+   :rtype: float
+
+.. function:: getVehicleConstraint(constraintId)
+
+   :arg constraintId: The id of the vehicle constraint.
+   :type constraintId: int
+
+   :return: a vehicle constraint object.
+   :rtype: :class:'KX_VehicleWrapper'
+
+.. function:: removeConstraint(constraintId)
+
+   Removes a constraint.
+
+   :arg constraintId: The id of the constraint to be removed.
+   :type constraintId: int
+
+.. function:: setCcdMode(ccdMode)
+
+   ..note::
+      Very experimental, not recommended
+
+   Sets the CCD mode in the Physics Environment.
+
+   :arg ccdMode: The new CCD mode.
+   :type ccdMode: int
+
+.. function:: setContactBreakingTreshold(breakingTreshold)
+
+   .. note::
+      Reasonable default is 0.02 (if units are meters)
+
+   Sets the contact breaking treshold in the Physics Environment.
+
+   :arg breakingTreshold: The new contact breaking treshold.
+   :type breakingTreshold: float
+
+.. function:: setDeactivationAngularTreshold(angularTreshold)
+
+   Sets the deactivation angular treshold.
+
+   :arg angularTreshold: New deactivation angular treshold.
+   :type angularTreshold: float
+
+.. function:: setDeactivationLinearTreshold(linearTreshold)
+
+   Sets the deactivation linear treshold.
+
+   :arg linearTreshold: New deactivation linear treshold.
+   :type linearTreshold: float
+
+.. function:: setDeactivationTime(time)
+
+   Sets the time after which a resting rigidbody gets deactived.
+
+   :arg time: The deactivation time.
+   :type time: float
+
+.. function:: setDebugMode(mode)
+
+   Sets the debug mode.
+
+   Debug modes:
+      - No debug: 0
+      - Draw wireframe: 1
+      - Draw Aabb: 2 #What's Aabb?
+      - Draw freatures text: 4
+      - Draw contact points: 8
+      - No deactivation: 16
+      - No help text: 32
+      - Draw text: 64
+      - Profile timings: 128
+      - Enable sat comparision: 256
+      - Disable Bullet LCP: 512
+      - Enable CCD: 1024
+      - Draw Constraints: #(1 << 11) = ?
+      - Draw Constraint Limits: #(1 << 12) = ?
+      - Fast Wireframe: #(1 << 13) = ?
+
+   :arg mode: The new debug mode.
+   :type mode: int
+
+.. function:: setGravity(x, y, z)
+
+   Sets the gravity force.
+
+   :arg x: Gravity X force.
+   :type x: float
+
+   :arg y: Gravity Y force.
+   :type y: float
+
+   :arg z: Gravity Z force.
+   :type z: float
+
+.. function:: setLinearAirDamping(damping)
+
+   Not implemented.
+
+.. function:: setNumIterations(numiter)
+
+   Sets the number of iterations for an iterative constraint solver.
+
+   :arg numiter: New number of iterations.
+   :type numiter: int
+
+.. function:: setNumTimeSubSteps(numsubstep)
+
+   Sets the number of substeps for each physics proceed. Tradeoff quality for performance.
+
+   :arg numsubstep: New number of substeps.
+   :type numsubstep: int
+
+.. function:: setSolverDamping(damping)
+
+   ..note::
+      Very experimental, not recommended
+
+   Sets the solver damping.
+
+   :arg damping: New damping for the solver.
+   :type damping: float
+
+.. function:: setSolverTau(tau)
+
+   .. note::
+      Very experimental, not recommended
+
+   Sets the solver tau.
+
+   :arg tau: New tau for the solver.
+   :type tau: float
+
+.. function:: setSolverType(solverType)
+
+   .. note::
+      Very experimental, not recommended
+
+   Sets the solver type.
+
+   :arg solverType: The new type of the solver.
+   :type solverType: int
+
+.. function:: setSorConstant(sor)
+
+   .. note::
+      Very experimental, not recommended
+
+   Sets the sor constant.
+
+   :arg sor: New sor value.
+   :type sor: float
+
+.. function:: setUseEpa(epa)
+
+   Not implemented.

Modified: branches/bmesh/blender/doc/python_api/rst/bge.events.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.events.rst	2011-07-26 02:35:46 UTC (rev 38711)
+++ branches/bmesh/blender/doc/python_api/rst/bge.events.rst	2011-07-26 03:00:55 UTC (rev 38712)
@@ -1,5 +1,5 @@
 
-Game Engine bge.events module
+Game Engine bge.events Module
 =============================
 
 *****

Modified: branches/bmesh/blender/doc/python_api/rst/bge.texture.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.texture.rst	2011-07-26 02:35:46 UTC (rev 38711)
+++ branches/bmesh/blender/doc/python_api/rst/bge.texture.rst	2011-07-26 03:00:55 UTC (rev 38712)
@@ -3,8 +3,8 @@

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list