[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37032] branches/bmesh/blender: svn merge -r36840:36890 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Campbell Barton ideasman42 at gmail.com
Tue May 31 04:55:30 CEST 2011


Revision: 37032
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37032
Author:   campbellbarton
Date:     2011-05-31 02:55:29 +0000 (Tue, 31 May 2011)
Log Message:
-----------
svn merge -r36840:36890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
    branches/bmesh/blender/intern/bsp/CMakeLists.txt
    branches/bmesh/blender/intern/bsp/SConscript
    branches/bmesh/blender/intern/container/CTR_TaggedIndex.h
    branches/bmesh/blender/intern/decimation/CMakeLists.txt
    branches/bmesh/blender/intern/decimation/SConscript
    branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
    branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
    branches/bmesh/blender/source/blender/python/generic/bgl.c
    branches/bmesh/blender/source/blender/python/generic/blf_py_api.c
    branches/bmesh/blender/source/blender/python/generic/mathutils.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_Color.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_Euler.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_Matrix.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_Quaternion.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_Vector.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_geometry.c
    branches/bmesh/blender/source/blender/python/generic/noise_py_api.c
    branches/bmesh/blender/source/blender/python/intern/bpy.c
    branches/bmesh/blender/source/blender/python/intern/bpy_library.c
    branches/bmesh/blender/source/blender/python/intern/bpy_props.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/creator/CMakeLists.txt

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-36840
   + /trunk/blender:31524-36890

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/CMakeLists.txt	2011-05-31 02:55:29 UTC (rev 37032)
@@ -1132,9 +1132,9 @@
 #-------------------------------------------------------------------------------
 # Global Defines
 
-# better not define flags here but this is a debugging option thats off by default.
+# better not set includes here but this debugging option is off by default.
 if(WITH_CXX_GUARDEDALLOC)
-	set(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+	include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
 endif()
 
 if(WITH_ASSERT_ABORT)

Modified: branches/bmesh/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py	2011-05-31 02:55:29 UTC (rev 37032)
@@ -21,3 +21,19 @@
 with bpy.data.libraries.load(filepath) as (data_from, data_to):
     for attr in dir(data_to):
         setattr(data_to, attr, getattr(data_from, attr))
+
+
+# the 'data_to' variables lists are 
+with bpy.data.libraries.load(filepath) as (data_from, data_to):
+    data_to.scenes = ["Scene"]
+
+
+# the loaded objects can be accessed from 'data_to' outside of the context
+# since loading the data replaces the strings for the datablocks or None
+# if the datablock could not be loaded.
+with bpy.data.libraries.load(filepath) as (data_from, data_to):
+    data_to.meshes = data_from.meshes
+# now operate directly on the loaded data
+for mesh in data_to.meshes:
+    if mesh is not None:
+        print(mesh.name)

Modified: branches/bmesh/blender/intern/bsp/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/bsp/CMakeLists.txt	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/intern/bsp/CMakeLists.txt	2011-05-31 02:55:29 UTC (rev 37032)
@@ -27,6 +27,7 @@
 set(INC
 	./intern
 	../container
+	../guardedalloc
 	../moto/include
 	../memutil
 )

Modified: branches/bmesh/blender/intern/bsp/SConscript
===================================================================
--- branches/bmesh/blender/intern/bsp/SConscript	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/intern/bsp/SConscript	2011-05-31 02:55:29 UTC (rev 37032)
@@ -3,7 +3,7 @@
 
 sources = env.Glob('intern/*.cpp')
 
-incs = 'intern ../container ../moto/include ../memutil'
+incs = 'intern ../container ../moto/include ../memutil ../guardedalloc'
 
 env.BlenderLib ('bf_intern_bsp', sources, Split(incs), [], libtype=['core','player'], priority=[200,100] )
 

Modified: branches/bmesh/blender/intern/container/CTR_TaggedIndex.h
===================================================================
--- branches/bmesh/blender/intern/container/CTR_TaggedIndex.h	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/intern/container/CTR_TaggedIndex.h	2011-05-31 02:55:29 UTC (rev 37032)
@@ -52,6 +52,8 @@
 
 #include <functional>
 
+#include "MEM_sys_types.h"
+
 enum {
 
 	empty_tag = 0x0,
@@ -100,9 +102,9 @@
 
 #if defined(_WIN64)
 	CTR_TaggedIndex(
-		const unsigned __int64 val
+		const uint64_t val
 	) :
-		m_val ( ((unsigned __int64)val & index_mask)
+		m_val ( ((uint64_t)val & index_mask)
 				| ( (empty_tag << tag_shift)
 					& (~index_mask) ) ) {
 	}
@@ -140,8 +142,8 @@
 	}
 
 #if defined(_WIN64)
-	operator unsigned __int64 () const {
-			return (unsigned __int64)(m_val & index_mask);
+	operator uint64_t () const {
+			return (uint64_t)(m_val & index_mask);
 		}
 #endif
 

Modified: branches/bmesh/blender/intern/decimation/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/decimation/CMakeLists.txt	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/intern/decimation/CMakeLists.txt	2011-05-31 02:55:29 UTC (rev 37032)
@@ -27,6 +27,7 @@
 set(INC
 	.
 	../container
+	../guardedalloc
 	../memutil
 	../moto/include
 )

Modified: branches/bmesh/blender/intern/decimation/SConscript
===================================================================
--- branches/bmesh/blender/intern/decimation/SConscript	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/intern/decimation/SConscript	2011-05-31 02:55:29 UTC (rev 37032)
@@ -3,6 +3,6 @@
 
 sources = env.Glob('intern/*.cpp')
 
-incs = '. ../moto/include ../container ../memutil'
+incs = '. ../moto/include ../container ../memutil ../guardedalloc'
 
 env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core', 'player'], priority = [200, 100] )

Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py	2011-05-31 02:14:25 UTC (rev 37031)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py	2011-05-31 02:55:29 UTC (rev 37032)
@@ -101,29 +101,29 @@
 # where all 4 values are or'd into a single value...
 #    (i1<<0 | i1<<3 | i1<<6 | i1<<9)
 _axis_convert_lut = (
-    {0x5c, 0x9a, 0x119, 0x15d, 0x20b, 0x2a2, 0x2c8, 0x365, 0x413, 0x46c, 0x4d0, 0x529, 0x644, 0x682, 0x701, 0x745, 0x823, 0x88a, 0x8e0, 0x94d, 0xa2b, 0xa54, 0xae8, 0xb11},
-    {0x9c, 0xac, 0x159, 0x169, 0x22b, 0x2e8, 0x40b, 0x465, 0x4c8, 0x522, 0x684, 0x694, 0x741, 0x751, 0x813, 0x8d0, 0xa23, 0xa4d, 0xae0, 0xb0a},
-    {0x99, 0xa9, 0x15c, 0x16c, 0x213, 0x2d0, 0x423, 0x44a, 0x4e0, 0x50d, 0x681, 0x691, 0x744, 0x754, 0x82b, 0x8e8, 0xa0b, 0xa62, 0xac8, 0xb25},
-    {0x59, 0x85, 0x11c, 0x142, 0x223, 0x28d, 0x2e0, 0x34a, 0x42b, 0x469, 0x4e8, 0x52c, 0x641, 0x69d, 0x704, 0x75a, 0x80b, 0x8a5, 0x8c8, 0x962, 0xa13, 0xa51, 0xad0, 0xb14},
-    {0xa5, 0x162, 0x21c, 0x285, 0x2d9, 0x342, 0x463, 0x46b, 0x520, 0x528, 0x68d, 0x74a, 0x804, 0x89d, 0x8c1, 0x95a, 0xa4b, 0xa53, 0xb08, 0xb10},
-    {0x4b, 0x53, 0x108, 0x110, 0x29c, 0x2ac, 0x359, 0x369, 0x41a, 0x422, 0x4dd, 0x4e5, 0x663, 0x66b, 0x720, 0x728, 0x884, 0x894, 0x941, 0x951, 0xa02, 0xa0a, 0xac5, 0xacd},
-    {0x63, 0x6b, 0x120, 0x128, 0x299, 0x2a9, 0x35c, 0x36c, 0x405, 0x40d, 0x4c2, 0x4ca, 0x64b, 0x653, 0x708, 0x710, 0x881, 0x891, 0x944, 0x954, 0xa1d, 0xa25, 0xada, 0xae2},
-    {0x8a, 0x14d, 0x219, 0x29a, 0x2dc, 0x35d, 0x44b, 0x453, 0x508, 0x510, 0x6a2, 0x765, 0x801, 0x882, 0x8c4, 0x945, 0xa63, 0xa6b, 0xb20, 0xb28},
-    {0x5a, 0x62, 0x8b, 0x11d, 0x125, 0x148, 0x22c, 0x28b, 0x293, 0x2e9, 0x348, 0x350, 0x41c, 0x42c, 0x45a, 0x4d9, 0x4e9, 0x51d, 0x642, 0x64a, 0x6a3, 0x705, 0x70d, 0x760, 0x814, 0x8a3, 0x8ab, 0x8d1, 0x960, 0x968, 0xa04, 0xa14, 0xa42, 0xac1, 0xad1, 0xb05},
-    {0x54, 0xab, 0x111, 0x168, 0x21d, 0x225, 0x2da, 0x2e2, 0x45c, 0x519, 0x66c, 0x693, 0x729, 0x750, 0x805, 0x80d, 0x8c2, 0x8ca, 0xa44, 0xb01},
-    {0x51, 0x93, 0x114, 0x150, 0x202, 0x20a, 0x2c5, 0x2cd, 0x459, 0x51c, 0x669, 0x6ab, 0x72c, 0x768, 0x81a, 0x822, 0x8dd, 0x8e5, 0xa41, 0xb04},
-    {0x45, 0x4d, 0xa3, 0x102, 0x10a, 0x160, 0x229, 0x2a3, 0x2ab, 0x2ec, 0x360, 0x368, 0x419, 0x429, 0x445, 0x4dc, 0x4ec, 0x502, 0x65d, 0x665, 0x68b, 0x71a, 0x722, 0x748, 0x811, 0x88b, 0x893, 0x8d4, 0x948, 0x950, 0xa01, 0xa11, 0xa5d, 0xac4, 0xad4, 0xb1a},
-    {0x5d, 0x65, 0xa0, 0x11a, 0x122, 0x163, 0x214, 0x2a0, 0x2a8, 0x2d1, 0x363, 0x36b, 0x404, 0x414, 0x45d, 0x4c1, 0x4d1, 0x51a, 0x645, 0x64d, 0x688, 0x702, 0x70a, 0x74b, 0x82c, 0x888, 0x890, 0x8e9, 0x94b, 0x953, 0xa1c, 0xa2c, 0xa45, 0xad9, 0xae9, 0xb02},
-    {0x6c, 0x90, 0x129, 0x153, 0x21a, 0x222, 0x2dd, 0x2e5, 0x444, 0x501, 0x654, 0x6a8, 0x711, 0x76b, 0x802, 0x80a, 0x8c5, 0x8cd, 0xa5c, 0xb19},
-    {0x69, 0xa8, 0x12c, 0x16b, 0x205, 0x20d, 0x2c2, 0x2ca, 0x441, 0x504, 0x651, 0x690, 0x714, 0x753, 0x81d, 0x825, 0x8da, 0x8e2, 0xa59, 0xb1c},
-    {0x42, 0x4a, 0x88, 0x105, 0x10d, 0x14b, 0x211, 0x288, 0x290, 0x2d4, 0x34b, 0x353, 0x401, 0x411, 0x442, 0x4c4, 0x4d4, 0x505, 0x65a, 0x662, 0x6a0, 0x71d, 0x725, 0x763, 0x829, 0x8a0, 0x8a8, 0x8ec, 0x963, 0x96b, 0xa19, 0xa29, 0xa5a, 0xadc, 0xaec, 0xb1d},
-    {0xa2, 0x165, 0x204, 0x282, 0x2c1, 0x345, 0x448, 0x450, 0x50b, 0x513, 0x68a, 0x74d, 0x81c, 0x89a, 0x8d9, 0x95d, 0xa60, 0xa68, 0xb23, 0xb2b},
-    {0x60, 0x68, 0x123, 0x12b, 0x284, 0x294, 0x341, 0x351, 0x41d, 0x425, 0x4da, 0x4e2, 0x648, 0x650, 0x70b, 0x713, 0x89c, 0x8ac, 0x959, 0x969, 0xa05, 0xa0d, 0xac2, 0xaca},
-    {0x48, 0x50, 0x10b, 0x113, 0x281, 0x291, 0x344, 0x354, 0x402, 0x40a, 0x4c5, 0x4cd, 0x660, 0x668, 0x723, 0x72b, 0x899, 0x8a9, 0x95c, 0x96c, 0xa1a, 0xa22, 0xadd, 0xae5},
-    {0x8d, 0x14a, 0x201, 0x29d, 0x2c4, 0x35a, 0x460, 0x468, 0x523, 0x52b, 0x6a5, 0x762, 0x819, 0x885, 0x8dc, 0x942, 0xa48, 0xa50, 0xb0b, 0xb13},
-    {0x44, 0x9d, 0x101, 0x15a, 0x220, 0x2a5, 0x2e3, 0x362, 0x428, 0x454, 0x4eb, 0x511, 0x65c, 0x685, 0x719, 0x742, 0x808, 0x88d, 0x8cb, 0x94a, 0xa10, 0xa6c, 0xad3, 0xb29},
-    {0x84, 0x94, 0x141, 0x151, 0x210, 0x2d3, 0x420, 0x462, 0x4e3, 0x525, 0x69c, 0x6ac, 0x759, 0x769, 0x828, 0x8eb, 0xa08, 0xa4a, 0xacb, 0xb0d},
-    {0x81, 0x91, 0x144, 0x154, 0x228, 0x2eb, 0x408, 0x44d, 0x4cb, 0x50a, 0x699, 0x6a9, 0x75c, 0x76c, 0x810, 0x8d3, 0xa20, 0xa65, 0xae3, 0xb22},
+    {0x8C8, 0x4D0, 0x2E0, 0xAE8, 0x701, 0x511, 0x119, 0xB29, 0x682, 0x88A, 0x09A, 0x2A2, 0x80B, 0x413, 0x223, 0xA2B, 0x644, 0x454, 0x05C, 0xA6C, 0x745, 0x94D, 0x15D, 0x365},
+    {0xAC8, 0x8D0, 0x4E0, 0x2E8, 0x741, 0x951, 0x159, 0x369, 0x702, 0xB0A, 0x11A, 0x522, 0xA0B, 0x813, 0x423, 0x22B, 0x684, 0x894, 0x09C, 0x2AC, 0x645, 0xA4D, 0x05D, 0x465},
+    {0x4C8, 0x2D0, 0xAE0, 0x8E8, 0x681, 0x291, 0x099, 0x8A9, 0x642, 0x44A, 0x05A, 0xA62, 0x40B, 0x213, 0xA23, 0x82B, 0x744, 0x354, 0x15C, 0x96C, 0x705, 0x50D, 0x11D, 0xB25},
+    {0x2C8, 0xAD0, 0x8E0, 0x4E8, 0x641, 0xA51, 0x059, 0x469, 0x742, 0x34A, 0x15A, 0x962, 0x20B, 0xA13, 0x823, 0x42B, 0x704, 0xB14, 0x11C, 0x52C, 0x685, 0x28D, 0x09D, 0x8A5},

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list