Revision: 39891
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39891
Author: campbellbarton
Date: 2011-09-03 12:57:33 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39878
Modified Paths:
--------------
branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h
branches/bmesh/blender/intern/opennl/superlu/superlu_sys_types.h
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenloader/BLO_sys_types.h
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/bmesh/blender/source/gameengine/Converter/BL_MeshDeformer.h
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeDeformer.h
branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonController.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/xembed/npunix.c
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/bmesh/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/bmesh/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_CameraData.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
branches/bmesh/blender/source/gameengine/SceneGraph/SG_DList.h
branches/bmesh/blender/source/gameengine/SceneGraph/SG_IObject.h
branches/bmesh/blender/source/gameengine/SceneGraph/SG_QList.h
branches/bmesh/blender/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/Exception.h
branches/bmesh/blender/source/gameengine/VideoTexture/ImageBase.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/ImageRender.cpp
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/space_outliner/
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-39878
+ /trunk/blender:31524-39890
Modified: branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h 2011-09-03
12:39:17 UTC (rev 39890)
+++ branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h 2011-09-03
12:57:33 UTC (rev 39891)
@@ -88,7 +88,7 @@
#define _UINTPTR_T_DEFINED
#endif
-#elif defined(__linux__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
Modified: branches/bmesh/blender/intern/opennl/superlu/superlu_sys_types.h
===================================================================
--- branches/bmesh/blender/intern/opennl/superlu/superlu_sys_types.h
2011-09-03 12:39:17 UTC (rev 39890)
+++ branches/bmesh/blender/intern/opennl/superlu/superlu_sys_types.h
2011-09-03 12:57:33 UTC (rev 39891)
@@ -89,7 +89,7 @@
#define _UINTPTR_T_DEFINED
#endif
-#elif defined(__linux__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39878
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39878
+
/trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-39890
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39878
+ /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-39890
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
2011-09-03 12:39:17 UTC (rev 39890)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
2011-09-03 12:57:33 UTC (rev 39891)
@@ -1023,46 +1023,70 @@
}
}
+/* note, these numbered comments below are copied from trunk,
+ * while _most_ match, some at the end need adding and are out of sync */
+
static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
+ /* 0: CD_MVERT */
{sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+ /* 1: CD_MSTICKY */
{sizeof(MSticky), "MSticky", 1, NULL, NULL, NULL, layerInterp_msticky,
NULL,
NULL},
+ /* 2: CD_MDEFORMVERT */
{sizeof(MDeformVert), "MDeformVert", 1, NULL, layerCopy_mdeformvert,
layerFree_mdeformvert, layerInterp_mdeformvert, NULL, NULL},
+ /* 3: CD_MEDGE */
{sizeof(MEdge), "MEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+ /* 4: CD_MFACE */
{sizeof(MFace), "MFace", 1, NULL, NULL, NULL, NULL, NULL, NULL},
+ /* 5: CD_MTFACE */
{sizeof(MTFace), "MTFace", 1, "UVTex", layerCopy_tface, NULL,
layerInterp_tface, layerSwap_tface, layerDefault_tface},
+ /* 6: CD_MCOL */
/* 4 MCol structs per face */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
