[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46933] branches/meshdata_transfer: svn merge ^/trunk/blender -r46844:HEAD
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Wed May 23 12:56:07 CEST 2012
Revision: 46933
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46933
Author: cyborgmuppet
Date: 2012-05-23 10:56:06 +0000 (Wed, 23 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46844:HEAD
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46844
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/SConstruct
branches/meshdata_transfer/build_files/scons/config/win32-mingw-config.py
branches/meshdata_transfer/build_files/scons/tools/Blender.py
branches/meshdata_transfer/build_files/scons/tools/btools.py
branches/meshdata_transfer/doc/python_api/examples/bpy.types.Mesh.py
branches/meshdata_transfer/doc/python_api/rst/include__bmesh.rst
branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp
branches/meshdata_transfer/intern/guardedalloc/intern/mmap_win.c
branches/meshdata_transfer/release/datafiles/blender_icons.png
branches/meshdata_transfer/release/scripts/startup/bl_operators/object.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/presets.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/wm.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_material.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_texture.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_node.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_key.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_node.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_object.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_screen.h
branches/meshdata_transfer/source/blender/blenkernel/intern/brush.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cloth.c
branches/meshdata_transfer/source/blender/blenkernel/intern/collision.c
branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/customdata.c
branches/meshdata_transfer/source/blender/blenkernel/intern/editderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/key.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lattice.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/node.c
branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/meshdata_transfer/source/blender/blenkernel/intern/pointcache.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/bmesh/bmesh_class.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_construct.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_interp.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_marking.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_queries.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_queries.h
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_extrude.c
branches/meshdata_transfer/source/blender/collada/ArmatureImporter.cpp
branches/meshdata_transfer/source/blender/compositor/intern/COM_Node.cpp
branches/meshdata_transfer/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/meshdata_transfer/source/blender/compositor/intern/COM_compositor.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_CompositorOperation.h
branches/meshdata_transfer/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/meshdata_transfer/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_TextureOperation.h
branches/meshdata_transfer/source/blender/editors/datafiles/blender_icons.png.c
branches/meshdata_transfer/source/blender/editors/datafiles/startup.blend.c
branches/meshdata_transfer/source/blender/editors/include/ED_node.h
branches/meshdata_transfer/source/blender/editors/include/ED_transform.h
branches/meshdata_transfer/source/blender/editors/include/UI_icons.h
branches/meshdata_transfer/source/blender/editors/include/UI_resources.h
branches/meshdata_transfer/source/blender/editors/interface/interface_regions.c
branches/meshdata_transfer/source/blender/editors/interface/interface_templates.c
branches/meshdata_transfer/source/blender/editors/interface/interface_widgets.c
branches/meshdata_transfer/source/blender/editors/interface/resources.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_data.c
branches/meshdata_transfer/source/blender/editors/object/object_bake.c
branches/meshdata_transfer/source/blender/editors/object/object_intern.h
branches/meshdata_transfer/source/blender/editors/object/object_modifier.c
branches/meshdata_transfer/source/blender/editors/object/object_ops.c
branches/meshdata_transfer/source/blender/editors/screen/screen_edit.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_intern.h
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_mask.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_stroke.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.c
branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/meshdata_transfer/source/blender/editors/space_node/node_buttons.c
branches/meshdata_transfer/source/blender/editors/space_node/node_draw.c
branches/meshdata_transfer/source/blender/editors/space_node/node_edit.c
branches/meshdata_transfer/source/blender/editors/space_node/node_intern.h
branches/meshdata_transfer/source/blender/editors/space_node/node_ops.c
branches/meshdata_transfer/source/blender/editors/space_node/node_select.c
branches/meshdata_transfer/source/blender/editors/space_node/node_templates.c
branches/meshdata_transfer/source/blender/editors/space_node/space_node.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_draw.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_add.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_draw.c
branches/meshdata_transfer/source/blender/editors/transform/transform.c
branches/meshdata_transfer/source/blender/editors/transform/transform.h
branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
branches/meshdata_transfer/source/blender/editors/transform/transform_input.c
branches/meshdata_transfer/source/blender/editors/transform/transform_ops.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_buffers.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_material.c
branches/meshdata_transfer/source/blender/makesdna/DNA_customdata_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_meshdata_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_modifier_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_node_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_scene_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_userdef_types.h
branches/meshdata_transfer/source/blender/makesrna/RNA_access.h
branches/meshdata_transfer/source/blender/makesrna/RNA_enum_types.h
branches/meshdata_transfer/source/blender/makesrna/intern/rna_key.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_lamp.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_lattice.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_modifier.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
branches/meshdata_transfer/source/blender/modifiers/CMakeLists.txt
branches/meshdata_transfer/source/blender/modifiers/MOD_modifiertypes.h
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_solidify.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_util.c
branches/meshdata_transfer/source/blender/nodes/composite/node_composite_tree.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/meshdata_transfer/source/blender/nodes/intern/node_common.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/meshdata_transfer/source/blender/python/intern/bpy_interface.c
branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/meshdata_transfer/source/creator/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/Ketsji/BL_Action.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
Added Paths:
-----------
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_skin.c
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_object_info.c
Property changes on: branches/meshdata_transfer
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46844
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46930
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-05-23 10:56:06 UTC (rev 46933)
@@ -238,8 +238,14 @@
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
+ set(PLATFORM_DEFAULT sm_20 sm_21)
+else()
+ set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
+endif()
+set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+unset(PLATFORM_DEFAULT)
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
Modified: branches/meshdata_transfer/SConstruct
===================================================================
--- branches/meshdata_transfer/SConstruct 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/SConstruct 2012-05-23 10:56:06 UTC (rev 46933)
@@ -553,7 +553,7 @@
source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
# To ensure empty dirs are created too
- if len(source)==0:
+ if len(source)==0 and not os.path.exists(dir):
env.Execute(Mkdir(dir))
scriptinstall.append(env.Install(dir=dir,source=source))
if env['WITH_BF_CYCLES']:
Modified: branches/meshdata_transfer/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/win32-mingw-config.py 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/build_files/scons/config/win32-mingw-config.py 2012-05-23 10:56:06 UTC (rev 46933)
@@ -169,6 +169,11 @@
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+
##
CC = 'gcc'
CXX = 'g++'
Modified: branches/meshdata_transfer/build_files/scons/tools/Blender.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/tools/Blender.py 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/build_files/scons/tools/Blender.py 2012-05-23 10:56:06 UTC (rev 46933)
@@ -869,12 +869,17 @@
lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation)
if lenv['WITH_BF_PYTHON']:
- if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+ if (not lenv['WITHOUT_BF_INSTALL'] and
+ not lenv['WITHOUT_BF_PYTHON_INSTALL'] and
+ not lenv['WITHOUT_BF_PYTHON_UNPACK'] and
+ not BlenderEnvironment.PyBundleActionAdded):
lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print))
BlenderEnvironment.PyBundleActionAdded = True
elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation
if lenv['WITH_BF_PYTHON']:
- if not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+ if (not lenv['WITHOUT_BF_PYTHON_INSTALL'] and
+ not lenv['WITHOUT_BF_PYTHON_UNPACK'] and
+ not BlenderEnvironment.PyBundleActionAdded):
lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print))
BlenderEnvironment.PyBundleActionAdded = True
return prog
Modified: branches/meshdata_transfer/build_files/scons/tools/btools.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/tools/btools.py 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/build_files/scons/tools/btools.py 2012-05-23 10:56:06 UTC (rev 46933)
@@ -134,7 +134,7 @@
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
'WITHOUT_BF_INSTALL',
- 'WITHOUT_BF_PYTHON_INSTALL',
+ 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
'WITHOUT_BF_OVERWRITE_INSTALL',
'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
'WITH_GHOST_COCOA',
@@ -519,6 +519,7 @@
(BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
(BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
(BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
+ (BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
(BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
(BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
Modified: branches/meshdata_transfer/doc/python_api/examples/bpy.types.Mesh.py
===================================================================
--- branches/meshdata_transfer/doc/python_api/examples/bpy.types.Mesh.py 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/doc/python_api/examples/bpy.types.Mesh.py 2012-05-23 10:56:06 UTC (rev 46933)
@@ -28,7 +28,7 @@
import bpy
me = bpy.context.object.data
-uv_layer = me.uv.layers.active.data
+uv_layer = me.uv_layers.active.data
for poly in me.polygons:
print("Polygon index: %d, length: %d" % (poly.index, poly.loop_total))
Modified: branches/meshdata_transfer/doc/python_api/rst/include__bmesh.rst
===================================================================
--- branches/meshdata_transfer/doc/python_api/rst/include__bmesh.rst 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/doc/python_api/rst/include__bmesh.rst 2012-05-23 10:56:06 UTC (rev 46933)
@@ -99,9 +99,11 @@
uv_lay = bm.loops.layers.uv.active
for face in bm.faces:
- for loop in f.loops:
- uv = loop[uv_lay]
- print("Loop UV: %f, %f" % (uv.x, uv.y))
+ for loop in face.loops:
+ uv = loop[uv_lay].uv
+ print("Loop UV: %f, %f" % uv[:])
+ vert = loop.vert
+ print("Loop Vert: (%f,%f,%f)" % vert.co[:])
.. code-block:: python
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp 2012-05-23 10:36:36 UTC (rev 46932)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp 2012-05-23 10:56:06 UTC (rev 46933)
@@ -285,52 +285,55 @@
/* object loop */
BL::Scene::objects_iterator b_ob;
+ BL::Scene b_sce = b_scene;
- for(b_scene.objects.begin(b_ob); b_ob != b_scene.objects.end(); ++b_ob) {
- bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
- uint ob_layer = get_layer(b_ob->layers());
+ for(; b_sce; b_sce = b_sce.background_set()) {
+ for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end(); ++b_ob) {
+ bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
+ uint ob_layer = get_layer(b_ob->layers());
- if(!hide && (ob_layer & scene_layer)) {
- if(b_ob->is_duplicator()) {
- /* dupli objects */
- object_create_duplilist(*b_ob, b_scene);
+ if(!hide && (ob_layer & scene_layer)) {
+ if(b_ob->is_duplicator()) {
+ /* dupli objects */
+ object_create_duplilist(*b_ob, b_scene);
- BL::Object::dupli_list_iterator b_dup;
- int b_index = 0;
+ BL::Object::dupli_list_iterator b_dup;
+ int b_index = 0;
- for(b_ob->dupli_list.begin(b_dup); b_dup != b_ob->dupli_list.end(); ++b_dup) {
- Transform tfm = get_transform(b_dup->matrix());
- BL::Object b_dup_ob = b_dup->object();
- bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
+ for(b_ob->dupli_list.begin(b_dup); b_dup != b_ob->dupli_list.end(); ++b_dup) {
+ Transform tfm = get_transform(b_dup->matrix());
+ BL::Object b_dup_ob = b_dup->object();
+ bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list