[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43611] branches/bmesh/blender: svn merge ^/trunk/blender -r43564:43609

Campbell Barton ideasman42 at gmail.com
Sun Jan 22 19:04:36 CET 2012


Revision: 43611
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43611
Author:   campbellbarton
Date:     2012-01-22 18:04:35 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43564:43609

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

Modified Paths:
--------------
    branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
    branches/bmesh/blender/doc/python_api/rst/bge.types.rst
    branches/bmesh/blender/intern/cycles/blender/addon/properties.py
    branches/bmesh/blender/intern/cycles/blender/addon/ui.py
    branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
    branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
    branches/bmesh/blender/intern/cycles/blender/blender_sync.h
    branches/bmesh/blender/intern/cycles/device/device_cpu.cpp
    branches/bmesh/blender/intern/cycles/kernel/kernel.cl
    branches/bmesh/blender/intern/cycles/kernel/kernel.cpp
    branches/bmesh/blender/intern/cycles/kernel/kernel.cu
    branches/bmesh/blender/intern/cycles/kernel/kernel.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_compat_cpu.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_compat_cuda.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_differential.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_displace.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_emission.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_light.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_montecarlo.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_optimized.cpp
    branches/bmesh/blender/intern/cycles/kernel/kernel_path.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_textures.h
    branches/bmesh/blender/intern/cycles/kernel/kernel_types.h
    branches/bmesh/blender/intern/cycles/kernel/svm/svm_image.h
    branches/bmesh/blender/intern/cycles/render/light.cpp
    branches/bmesh/blender/intern/cycles/render/light.h
    branches/bmesh/blender/intern/cycles/render/mesh_displace.cpp
    branches/bmesh/blender/intern/cycles/render/scene.h
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_global.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_main.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
    branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
    branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/image.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
    branches/bmesh/blender/source/blender/blenkernel/intern/nla.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenkernel/intern/text.c
    branches/bmesh/blender/source/blender/blenlib/intern/BLI_kdtree.c
    branches/bmesh/blender/source/blender/blenlib/intern/boxpack2d.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_rotation.c
    branches/bmesh/blender/source/blender/blenlib/intern/noise.c
    branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
    branches/bmesh/blender/source/blender/blenpluginapi/iff.h
    branches/bmesh/blender/source/blender/editors/armature/editarmature.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_retarget.c
    branches/bmesh/blender/source/blender/editors/armature/poselib.c
    branches/bmesh/blender/source/blender/editors/curve/editcurve.c
    branches/bmesh/blender/source/blender/editors/include/ED_object.h
    branches/bmesh/blender/source/blender/editors/include/UI_interface.h
    branches/bmesh/blender/source/blender/editors/include/UI_interface_icons.h
    branches/bmesh/blender/source/blender/editors/include/UI_resources.h
    branches/bmesh/blender/source/blender/editors/interface/interface.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/interface/interface_icons.c
    branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
    branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
    branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/interface/resources.c
    branches/bmesh/blender/source/blender/editors/interface/view2d.c
    branches/bmesh/blender/source/blender/editors/object/object_add.c
    branches/bmesh/blender/source/blender/editors/object/object_relations.c
    branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
    branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
    branches/bmesh/blender/source/blender/editors/space_file/filelist.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_edit.c
    branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_edit.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_intern.h
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
    branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
    branches/bmesh/blender/source/blender/editors/space_script/script_edit.c
    branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/util/ed_util.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/bmesh/blender/source/blender/imbuf/IMB_imbuf_types.h
    branches/bmesh/blender/source/blender/imbuf/intern/IMB_anim.h
    branches/bmesh/blender/source/blender/imbuf/intern/IMB_indexer.h
    branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
    branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_customdata_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_fileglobal_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_image_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_movieclip_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_object_fluidsim.h
    branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
    branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sound_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_vfont_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/bmesh/blender/source/blender/nodes/intern/node_socket.c
    branches/bmesh/blender/source/blender/python/intern/bpy_props.c
    branches/bmesh/blender/source/blender/quicktime/quicktime_export.h
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
    branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
    branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
    branches/bmesh/blender/source/blender/render/intern/source/shadbuf.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
    branches/bmesh/blender/source/blender/render/intern/source/volumetric.c
    branches/bmesh/blender/source/blender/windowmanager/WM_types.h
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonKeyboard.h
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonMouse.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.h
    branches/bmesh/blender/source/gameengine/VideoTexture/blendVideoTex.cpp

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/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
/trunk/blender:39992-43564
   + /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
/trunk/blender:39992-43609

Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py	2012-01-22 17:54:23 UTC (rev 43610)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py	2012-01-22 18:04:35 UTC (rev 43611)
@@ -37,7 +37,8 @@
 CHECKER_ARGS = [
     # not sure why this is needed, but it is.
     "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
-
+	"--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+    # "--max-configs=1",  # speeds up execution
     #  "--check-config", # when includes are missing
     "--enable=all",  # if you want sixty hundred pedantic suggestions
     ]

Modified: branches/bmesh/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.types.rst	2012-01-22 17:54:23 UTC (rev 43610)
+++ branches/bmesh/blender/doc/python_api/rst/bge.types.rst	2012-01-22 18:04:35 UTC (rev 43611)
@@ -66,6 +66,12 @@
 
       :type: dictionary {:ref:`keycode<keyboard-keys>`::ref:`status<input-status>`, ...}
 
+   .. attribute:: active_events
+
+      A dictionary containing the status of only the active keyboard events or keys. (read-only).
+
+      :type: dictionary {:ref:`keycode<keyboard-keys>`::ref:`status<input-status>`, ...}
+
 .. class:: SCA_PythonMouse(PyObjectPlus)
 
    The current mouse.
@@ -75,6 +81,12 @@
       a dictionary containing the status of each mouse event. (read-only).
 
       :type: dictionary {:ref:`keycode<mouse-keys>`::ref:`status<input-status>`, ...}
+
+   .. attribute:: active_events
+
+      a dictionary containing the status of only the active mouse events. (read-only).
+
+      :type: dictionary {:ref:`keycode<mouse-keys>`::ref:`status<input-status>`, ...}
       
    .. attribute:: position
 
@@ -980,7 +992,7 @@
 
    .. attribute:: worldScale
 
-      The object's world scaling factor. Read-only. [sx, sy, sz]
+      The object's world scaling factor. [sx, sy, sz]
 
       :type: :class:`mathutils.Vector`
 
@@ -995,6 +1007,18 @@
       The object's world position. [x, y, z]
 
       :type: :class:`mathutils.Vector`
+
+   .. attribute:: localTransform
+
+      The object's local space transform matrix. 4x4 Matrix.
+
+      :type: :class:`mathutils.Matrix`
+
+   .. attribute:: worldTransform
+
+      The object's world space transform matrix. 4x4 Matrix.
+
+      :type: :class:`mathutils.Matrix`
 	  
    .. attribute:: localLinearVelocity
       

Modified: branches/bmesh/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/properties.py	2012-01-22 17:54:23 UTC (rev 43610)
+++ branches/bmesh/blender/intern/cycles/blender/addon/properties.py	2012-01-22 18:04:35 UTC (rev 43611)
@@ -33,79 +33,190 @@
 class CyclesRenderSettings(bpy.types.PropertyGroup):
     @classmethod
     def register(cls):
-        bpy.types.Scene.cycles = PointerProperty(type=cls, name="Cycles Render Settings", description="Cycles render settings")
+        bpy.types.Scene.cycles = PointerProperty(
+                name="Cycles Render Settings",
+                description="Cycles render settings",
+                type=cls,
+                )
+        cls.device = EnumProperty(
+                name="Device",
+                description="Device to use for rendering",
+                items=enums.devices,
+                default='CPU',
+                )
+        cls.feature_set = EnumProperty(
+                name="Feature Set",
+                description="Feature set to use for rendering",
+                items=enums.feature_set,
+                default='SUPPORTED',
+                )
+        cls.shading_system = EnumProperty(
+                name="Shading System",
+                description="Shading system to use for rendering",
+                items=enums.shading_systems,
+                default='GPU_COMPATIBLE',
+                )
 
-        cls.device = EnumProperty(name="Device", description="Device to use for rendering",
-            items=enums.devices, default="CPU")
+        cls.samples = IntProperty(
+                name="Samples",
+                description="Number of samples to render for each pixel",
+                min=1, max=2147483647,
+                default=10,
+                )
+        cls.preview_samples = IntProperty(
+                name="Preview Samples",
+                description="Number of samples to render in the viewport, unlimited if 0",
+                min=0, max=2147483647,
+                default=10,
+                )
+        cls.preview_pause = BoolProperty(
+                name="Pause Preview",
+                description="Pause all viewport preview renders",
+                default=False,
+                )
 
-        cls.feature_set = EnumProperty(name="Feature Set", description="Feature set to use for rendering",
-            items=enums.feature_set, default="SUPPORTED")
+        cls.no_caustics = BoolProperty(
+                name="No Caustics",
+                description="Leave out caustics, resulting in a darker image with less noise",
+                default=False,
+                )
+        cls.blur_caustics = FloatProperty(
+                name="Blur Caustics",
+                description="Blur caustics to reduce noise",
+                min=0.0, max=1.0,
+                default=0.0,
+                )
 
-        cls.shading_system = EnumProperty(name="Shading System", description="Shading system to use for rendering",
-            items=enums.shading_systems, default="GPU_COMPATIBLE")
+        cls.min_bounces = IntProperty(
+                name="Min Bounces",
+                description="Minimum number of bounces, setting this lower than the maximum enables probalistic path termination (faster but noisier)",
+                min=0, max=1024,
+                default=3,
+                )
+        cls.max_bounces = IntProperty(
+                name="Max Bounces",
+                description="Total maximum number of bounces",
+                min=0, max=1024,
+                default=8,
+                )
 
-        cls.samples = IntProperty(name="Samples", description="Number of samples to render for each pixel",
-            default=10, min=1, max=2147483647)
-        cls.preview_samples = IntProperty(name="Preview Samples", description="Number of samples to render in the viewport, unlimited if 0",
-            default=10, min=0, max=2147483647)
-        cls.preview_pause = BoolProperty(name="Pause Preview", description="Pause all viewport preview renders",
-            default=False)
+        cls.diffuse_bounces = IntProperty(
+                name="Diffuse Bounces",
+                description="Maximum number of diffuse reflection bounces, bounded by total maximum",
+                min=0, max=1024,
+                default=128,
+                )
+        cls.glossy_bounces = IntProperty(
+                name="Glossy Bounces",
+                description="Maximum number of glossy reflection bounces, bounded by total maximum",
+                min=0, max=1024,
+                default=128,
+                )
+        cls.transmission_bounces = IntProperty(
+                name="Transmission Bounces",
+                description="Maximum number of transmission bounces, bounded by total maximum",
+                min=0, max=1024,
+                default=128,
+                )
 
-        cls.no_caustics = BoolProperty(name="No Caustics", description="Leave out caustics, resulting in a darker image with less noise",
-            default=False)
-        cls.blur_caustics = FloatProperty(name="Blur Caustics", description="Blur caustics to reduce noise",
-            default=0.0, min=0.0, max=1.0)
+        cls.transparent_min_bounces = IntProperty(
+                name="Transparent Min Bounces",
+                description="Minimum number of transparent bounces, setting this lower than the maximum enables probalistic path termination (faster but noisier)",
+                min=0, max=1024,
+                default=8,
+                )
+        cls.transparent_max_bounces = IntProperty(
+                name="Transparent Max Bounces",
+                description="Maximum number of transparent bounces",
+                min=0, max=1024,
+                default=8,
+                )
+        cls.use_transparent_shadows = BoolProperty(
+                name="Transparent Shadows",
+                description="Use transparency of surfaces for rendering shadows",
+                default=True,
+                )
 
-        cls.min_bounces = IntProperty(name="Min Bounces", description="Minimum number of bounces, setting this lower than the maximum enables probalistic path termination (faster but noisier)",
-            default=3, min=0, max=1024)
-        cls.max_bounces = IntProperty(name="Max Bounces", description="Total maximum number of bounces",
-            default=8, min=0, max=1024)
+        cls.film_exposure = FloatProperty(
+                name="Exposure",
+                description="Image brightness scale",
+                min=0.0, max=10.0,
+                default=1.0,
+                )
+        cls.film_transparent = BoolProperty(
+                name="Transparent",
+                description="World background is transparent",
+                default=False,
+                )
 

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list