[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53624] branches/soc-2012-bratwurst: svn merge ^/trunk/blender -r50999:51100
Campbell Barton
ideasman42 at gmail.com
Mon Jan 7 08:56:58 CET 2013
Revision: 53624
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53624
Author: campbellbarton
Date: 2013-01-07 07:56:54 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r50999:51100
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50999
Modified Paths:
--------------
branches/soc-2012-bratwurst/CMakeLists.txt
branches/soc-2012-bratwurst/build_files/package_spec/rpm/blender.spec.in
branches/soc-2012-bratwurst/doc/manpage/blender.1
branches/soc-2012-bratwurst/doc/python_api/rst/bge.logic.rst
branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst
branches/soc-2012-bratwurst/extern/carve/CMakeLists.txt
branches/soc-2012-bratwurst/intern/bsp/CMakeLists.txt
branches/soc-2012-bratwurst/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_sync.h
branches/soc-2012-bratwurst/intern/cycles/blender/blender_util.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_object.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_types.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2012-bratwurst/intern/cycles/kernel/svm/svm_types.h
branches/soc-2012-bratwurst/intern/cycles/render/CMakeLists.txt
branches/soc-2012-bratwurst/intern/cycles/render/graph.cpp
branches/soc-2012-bratwurst/intern/cycles/render/nodes.cpp
branches/soc-2012-bratwurst/intern/cycles/render/nodes.h
branches/soc-2012-bratwurst/intern/cycles/render/object.cpp
branches/soc-2012-bratwurst/intern/cycles/render/object.h
branches/soc-2012-bratwurst/intern/cycles/render/svm.cpp
branches/soc-2012-bratwurst/intern/opencolorio/CMakeLists.txt
branches/soc-2012-bratwurst/intern/opencolorio/SConscript
branches/soc-2012-bratwurst/intern/opencolorio/ocio_capi.h
branches/soc-2012-bratwurst/intern/opennl/intern/opennl.c
branches/soc-2012-bratwurst/intern/opennl/superlu/get_perm_c.c
branches/soc-2012-bratwurst/intern/tools/credits_svn_gen.py
branches/soc-2012-bratwurst/release/datafiles/splash.png
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
branches/soc-2012-bratwurst/release/scripts/presets/interface_theme/elsyiun.xml
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/anim.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_info.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-bratwurst/source/blender/blenfont/BLF_translation.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_anim.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_armature.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/action.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/colortools.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/ipo.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/object.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/scene.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/texture.c
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_lasso.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/lasso.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c
branches/soc-2012-bratwurst/source/blender/collada/DocumentImporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/DocumentImporter.h
branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_intern.h
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_ops.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframing.c
branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature.c
branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2012-bratwurst/source/blender/editors/armature/meshlaplacian.c
branches/soc-2012-bratwurst/source/blender/editors/armature/poseobject.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editcurve.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_armature.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_mesh.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_object.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_particle.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_view3d.h
branches/soc-2012-bratwurst/source/blender/editors/include/UI_interface.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_intern.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_templates.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-bratwurst/source/blender/editors/mask/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editface.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_add.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/meshtools.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_add.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_constraint.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_edit.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_intern.h
branches/soc-2012-bratwurst/source/blender/editors/object/object_ops.c
branches/soc-2012-bratwurst/source/blender/editors/physics/particle_edit.c
branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.h
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_orientations.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_snap.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-bratwurst/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2012-bratwurst/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/colormanagement.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/divers.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/indexer.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_curve_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_defs.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/intern/makesdna.c
branches/soc-2012-bratwurst/source/blender/makesrna/RNA_enum_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_internal.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_texture.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_interface.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/convertblender.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/occlusion.c
branches/soc-2012-bratwurst/source/blender/windowmanager/WM_api.h
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2012-bratwurst/source/tools/tag_release.py
Added Paths:
-----------
branches/soc-2012-bratwurst/intern/opencolorio/fallback_impl.cc
branches/soc-2012-bratwurst/intern/opencolorio/ocio_capi.cc
branches/soc-2012-bratwurst/intern/opencolorio/ocio_impl.cc
branches/soc-2012-bratwurst/intern/opencolorio/ocio_impl.h
Removed Paths:
-------------
branches/soc-2012-bratwurst/intern/opencolorio/ocio_capi.cpp
branches/soc-2012-bratwurst/intern/opencolorio/ocio_capi_stub.cpp
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:46808-50910
+ /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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:46808-50910,51000-51100
Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/CMakeLists.txt 2013-01-07 07:56:54 UTC (rev 53624)
@@ -575,7 +575,7 @@
# lame, but until we have propper find module for ffmpeg
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
if(EXISTS "${FFMPEG}/include/ffmpeg/")
- set(FFMPEG_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS} ${FFMPEG}/include/ffmpeg")
+ list(APPEND FFMPEG_INCLUDE_DIRS "${FFMPEG}/include/ffmpeg")
endif()
# end lameness
Modified: branches/soc-2012-bratwurst/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- branches/soc-2012-bratwurst/build_files/package_spec/rpm/blender.spec.in 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/build_files/package_spec/rpm/blender.spec.in 2013-01-07 07:56:54 UTC (rev 53624)
@@ -76,6 +76,7 @@
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}/%{blender_api}/datafiles/fonts
+%{_datadir}/%{name}/%{blender_api}/datafiles/colormanagement
%{_datadir}/%{name}/%{blender_api}/scripts
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/applications/%{name}.desktop
Modified: branches/soc-2012-bratwurst/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/soc-2012-bratwurst/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/rst/bge.logic.rst 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/doc/python_api/rst/bge.logic.rst 2013-01-07 07:56:54 UTC (rev 53624)
@@ -2,9 +2,9 @@
Game Logic (bge.logic)
======================
-*****
-Intro
-*****
+************
+Introduction
+************
Module to access logic functions, imported automatically into the python controllers namespace.
Modified: branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst 2013-01-07 07:56:54 UTC (rev 53624)
@@ -4,6 +4,33 @@
.. module:: bge.types
+************
+Introduction
+************
+
+This module contains the classes that appear as instances in the Game Engine. A
+script must interact with these classes if it is to affect the behaviour of
+objects in a game.
+
+The following example would move an object (i.e. an instance of
+:class:`KX_GameObject`) one unit up.
+
+.. code-block:: python
+
+ # bge.types.SCA_PythonController
+ cont = bge.logic.getCurrentController()
+
+ # bge.types.KX_GameObject
+ obj = cont.owner
+ obj.worldPosition.z += 1
+
+To run the code, it could be placed in a Blender text block and executed with
+a :class:`SCA_PythonController` logic brick.
+
+*****
+Types
+*****
+
.. class:: PyObjectPlus
PyObjectPlus base class of most other types in the Game Engine.
@@ -854,6 +881,52 @@
Calling ANY method or attribute on an object that has been removed from a scene will raise a SystemError, if an object may have been removed since last accessing it use the :data:`invalid` attribute to check.
+ KX_GameObject can be subclassed to extend functionality. For example:
+
+ .. code-block:: python
+
+ import bge
+
+ class CustomGameObject(bge.types.KX_GameObject):
+ RATE = 0.05
+
+ def __init__(self, old_owner):
+ # "old_owner" can just be ignored. At this point, "self" is
+ # already the object in the scene, and "old_owner" has been
+ # destroyed.
+
+ # New attributes can be defined - but we could also use a game
+ # property, like "self['rate']".
+ self.rate = CustomGameObject.RATE
+
+ def update(self):
+ self.worldPosition.z += self.rate
+
+ # switch direction
+ if self.worldPosition.z > 1.0:
+ self.rate = -CustomGameObject.RATE
+ elif self.worldPosition.z < 0.0:
+ self.rate = CustomGameObject.RATE
+
+ # Called first
+ def mutate(cont):
+ old_object = cont.owner
+ mutated_object = CustomGameObject(cont.owner)
+
+ # After calling the constructor above, references to the old object
+ # should not be used.
+ assert(old_object is not mutated_object)
+ assert(old_object.invalid)
+ assert(mutated_object is cont.owner)
+
+ # Called later - note we are now working with the mutated object.
+ def update(cont):
+ cont.owner.update()
+
+ When subclassing objects other than empties and meshes, the specific type
+ should be used - e.g. inherit from :class:`BL_ArmatureObject` when the object
+ to mutate is an armature.
+
.. attribute:: name
The object's name. (read-only).
Modified: branches/soc-2012-bratwurst/extern/carve/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/extern/carve/CMakeLists.txt 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/extern/carve/CMakeLists.txt 2013-01-07 07:56:54 UTC (rev 53624)
@@ -158,7 +158,7 @@
-DCARVE_SYSTEM_BOOST
)
- list(APPEND INC
+ list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
)
endif()
Modified: branches/soc-2012-bratwurst/intern/bsp/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/intern/bsp/CMakeLists.txt 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/intern/bsp/CMakeLists.txt 2013-01-07 07:56:54 UTC (rev 53624)
@@ -62,7 +62,7 @@
-DCARVE_SYSTEM_BOOST
)
- list(APPEND INC
+ list(APPEND INC_SYS
${BOOST_INCLUDE_DIR}
)
endif()
Modified: branches/soc-2012-bratwurst/intern/bsp/intern/BOP_CarveInterface.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/bsp/intern/BOP_CarveInterface.cpp 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/intern/bsp/intern/BOP_CarveInterface.cpp 2013-01-07 07:56:54 UTC (rev 53624)
@@ -58,7 +58,7 @@
cross = carve::geom::cross(vec1, vec2);
float production = carve::geom::dot(cross, vec3);
- float magnitude = 1e-6 * cross.length();
+ float magnitude = 1e-5 * cross.length();
return fabs(production) < magnitude;
}
Modified: branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp 2013-01-07 06:33:29 UTC (rev 53623)
+++ branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp 2013-01-07 07:56:54 UTC (rev 53624)
@@ -194,8 +194,10 @@
/* Object */
-void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob, Transform& tfm, uint layer_flag, int motion, int particle_id)
+void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::DupliObject b_dupli_ob, Transform& tfm, uint layer_flag, int motion, int particle_id)
{
+ BL::Object b_ob = (b_dupli_ob ? b_dupli_ob.object() : b_parent);
+
/* light is handled separately */
if(object_is_light(b_ob)) {
if(!motion)
@@ -274,6 +276,15 @@
object->visibility &= ~PATH_RAY_CAMERA;
}
+ if (b_dupli_ob) {
+ object->dupli_generated = get_float3(b_dupli_ob.orco());
+ object->dupli_uv = get_float2(b_dupli_ob.uv());
+ }
+ else {
+ object->dupli_generated = make_float3(0.0f, 0.0f, 0.0f);
+ object->dupli_uv = make_float2(0.0f, 0.0f);
+ }
+
object->particle_id = particle_id;
object->tag_update(scene);
@@ -328,7 +339,7 @@
bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
if(!(b_dup->hide() || dup_hide)) {
- sync_object(*b_ob, b_index, b_dup_ob, tfm, ob_layer, motion, b_dup->particle_index() + particle_offset);
+ sync_object(*b_ob, b_index, *b_dup, tfm, ob_layer, motion, b_dup->particle_index() + particle_offset);
}
++b_index;
@@ -346,7 +357,7 @@
if(!hide) {
/* object itself */
Transform tfm = get_transform(b_ob->matrix_world());
- sync_object(*b_ob, 0, *b_ob, tfm, ob_layer, motion, 0);
+ sync_object(*b_ob, 0, PointerRNA_NULL, tfm, ob_layer, motion, 0);
}
particle_offset += num_particles;
Modified: branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp 2013-01-07 06:33:29 UTC (rev 53623)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list