[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22754] branches/volume25: svn merge -r 22628:22753 https://svn.blender.org/svnroot/bf-blender/ branches/blender2.5/blender
Matt Ebb
matt at mke3.net
Tue Aug 25 03:37:12 CEST 2009
Revision: 22754
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22754
Author: broken
Date: 2009-08-25 03:37:08 +0200 (Tue, 25 Aug 2009)
Log Message:
-----------
svn merge -r 22628:22753 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/volume25/CMakeLists.txt
branches/volume25/SConstruct
branches/volume25/config/win32-mingw-config.py
branches/volume25/config/win32-vc-config.py
branches/volume25/release/io/engine_render_pov.py
branches/volume25/release/scripts/bpymodules/colladaImEx/collada.py
branches/volume25/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/volume25/release/scripts/bpymodules/colladaImEx/translator.py
branches/volume25/release/ui/buttons_data_bone.py
branches/volume25/release/ui/buttons_data_modifier.py
branches/volume25/release/ui/space_image.py
branches/volume25/release/ui/space_time.py
branches/volume25/release/ui/space_view3d.py
branches/volume25/source/blender/blenkernel/intern/modifier.c
branches/volume25/source/blender/editors/animation/anim_channels_defines.c
branches/volume25/source/blender/editors/animation/anim_ipo_utils.c
branches/volume25/source/blender/editors/animation/keyframing.c
branches/volume25/source/blender/editors/include/UI_interface.h
branches/volume25/source/blender/editors/interface/interface_layout.c
branches/volume25/source/blender/editors/interface/interface_widgets.c
branches/volume25/source/blender/editors/interface/resources.c
branches/volume25/source/blender/editors/mesh/editmesh_mods.c
branches/volume25/source/blender/editors/screen/screen_ops.c
branches/volume25/source/blender/editors/space_action/action_draw.c
branches/volume25/source/blender/editors/space_action/action_header.c
branches/volume25/source/blender/editors/space_action/space_action.c
branches/volume25/source/blender/editors/space_console/console_ops.c
branches/volume25/source/blender/editors/space_console/console_report.c
branches/volume25/source/blender/editors/space_graph/graph_header.c
branches/volume25/source/blender/editors/space_logic/logic_window.c
branches/volume25/source/blender/editors/space_text/text_header.c
branches/volume25/source/blender/editors/space_text/text_ops.c
branches/volume25/source/blender/editors/space_view3d/drawvolume.c
branches/volume25/source/blender/editors/space_view3d/view3d_header.c
branches/volume25/source/blender/editors/transform/transform_generics.c
branches/volume25/source/blender/editors/transform/transform_ops.c
branches/volume25/source/blender/editors/util/undo.c
branches/volume25/source/blender/gpu/intern/gpu_extensions.c
branches/volume25/source/blender/imbuf/intern/openexr/SConscript
branches/volume25/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/volume25/source/blender/makesdna/DNA_sensor_types.h
branches/volume25/source/blender/makesdna/DNA_space_types.h
branches/volume25/source/blender/makesrna/intern/rna_modifier.c
branches/volume25/source/blender/makesrna/intern/rna_pose.c
branches/volume25/source/blender/makesrna/intern/rna_space.c
branches/volume25/source/blender/makesrna/intern/rna_ui_api.c
branches/volume25/source/blender/makesrna/intern/rna_userdef.c
branches/volume25/source/blender/windowmanager/intern/wm_operators.c
branches/volume25/source/creator/CMakeLists.txt
branches/volume25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/volume25/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/volume25/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/volume25/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/volume25/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/volume25/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/volume25/source/gameengine/PyDoc/GameTypes.py
Removed Paths:
-------------
branches/volume25/source/blender/editors/sculpt_paint/sculpt_stroke.c
Modified: branches/volume25/CMakeLists.txt
===================================================================
--- branches/volume25/CMakeLists.txt 2009-08-25 01:12:23 UTC (rev 22753)
+++ branches/volume25/CMakeLists.txt 2009-08-25 01:37:08 UTC (rev 22754)
@@ -251,8 +251,8 @@
IF(WITH_JACK)
SET(JACK ${LIBDIR}/jack)
- SET(JACK_INC ${JACK}/include/jack)
- SET(JACK_LIB jack)
+ SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+ SET(JACK_LIB libjack)
SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK)
Modified: branches/volume25/SConstruct
===================================================================
--- branches/volume25/SConstruct 2009-08-25 01:12:23 UTC (rev 22753)
+++ branches/volume25/SConstruct 2009-08-25 01:37:08 UTC (rev 22754)
@@ -580,11 +580,11 @@
'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
- '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
- '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
- '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
- '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
- '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
+# '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
+# '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
+# '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+# '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
+# '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
if env['WITH_BF_JACK']:
dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
Modified: branches/volume25/config/win32-mingw-config.py
===================================================================
--- branches/volume25/config/win32-mingw-config.py 2009-08-25 01:12:23 UTC (rev 22753)
+++ branches/volume25/config/win32-mingw-config.py 2009-08-25 01:37:08 UTC (rev 22754)
@@ -22,9 +22,9 @@
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_FFMPEG = False
-BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
-BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
-BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include'
+BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
+BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include'
BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
Modified: branches/volume25/config/win32-vc-config.py
===================================================================
--- branches/volume25/config/win32-vc-config.py 2009-08-25 01:12:23 UTC (rev 22753)
+++ branches/volume25/config/win32-vc-config.py 2009-08-25 01:37:08 UTC (rev 22754)
@@ -4,7 +4,7 @@
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
BF_FFMPEG = LIBDIR +'/ffmpeg'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
Modified: branches/volume25/release/io/engine_render_pov.py
===================================================================
--- branches/volume25/release/io/engine_render_pov.py 2009-08-25 01:12:23 UTC (rev 22753)
+++ branches/volume25/release/io/engine_render_pov.py 2009-08-25 01:37:08 UTC (rev 22754)
@@ -635,11 +635,89 @@
file.close()
+# Radiosity panel, use in the scene for now.
+FloatProperty= bpy.types.Scene.FloatProperty
+IntProperty= bpy.types.Scene.IntProperty
+BoolProperty= bpy.types.Scene.BoolProperty
+# Not a real pov option, just to know if we should write
+BoolProperty( attr="pov_radio_enable",
+ name="Enable Radiosity",
+ description="Enable povrays radiosity calculation.",
+ default= False)
+BoolProperty( attr="pov_radio_display_advanced",
+ name="Advanced Options",
+ description="Show advanced options.",
+ default= False)
+
+# Real pov options
+FloatProperty( attr="pov_radio_adc_bailout",
+ name="ADC Bailout",
+ description="The adc_bailout for radiosity rays. Use adc_bailout = 0.01 / brightest_ambient_object for good results.",
+ min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default= 0.01)
+
+BoolProperty( attr="pov_radio_always_sample",
+ name="Always Sample",
+ description="Only use the data from the pretrace step and not gather any new samples during the final radiosity pass..",
+ default= True)
+
+FloatProperty( attr="pov_radio_brightness",
+ name="Brightness",
+ description="Ammount objects are brightened before being returned upwards to the rest of the system.",
+ min=0.0, max=1000.0, soft_min=0.0, soft_max=10.0, default= 1.0)
+
+IntProperty( attr="pov_radio_count",
+ name="Ray Count",
+ description="number of rays that are sent out whenever a new radiosity value has to be calculated.",
+ min=1, max=1600, default= 35)
+
+FloatProperty( attr="pov_radio_error_bound",
+ name="Error Bound",
+ description="one of the two main speed/quality tuning values, lower values are more accurate.",
+ min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default= 1.8)
+
+FloatProperty( attr="pov_radio_gray_threshold",
+ name="Gray Threshold",
+ description="one of the two main speed/quality tuning values, lower values are more accurate.",
+ min=0.0, max=1.0, soft_min=0, soft_max=1, default= 0.0)
+
+FloatProperty( attr="pov_radio_low_error_factor",
+ name="Low Error Factor",
+ description="If you calculate just enough samples, but no more, you will get an image which has slightly blotchy lighting.",
+ min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, default= 0.5)
+
+# max_sample - not available yet
+BoolProperty( attr="pov_radio_media",
+ name="Media",
+ description="Radiosity estimation can be affected by media.",
+ default= False)
+
+FloatProperty( attr="pov_radio_minimum_reuse",
+ name="Minimum Reuse",
+ description="Fraction of the screen width which sets the minimum radius of reuse for each sample point (At values higher than 2% expect errors).",
+ min=0.0, max=1.0, soft_min=0.1, soft_max=0.1, default= 0.015)
+
+IntProperty( attr="pov_radio_nearest_count",
+ name="Nearest Count",
+ description="Number of old ambient values blended together to create a new interpolated value.",
+ min=1, max=20, default= 5)
+
+BoolProperty( attr="pov_radio_normal",
+ name="Normals",
+ description="Radiosity estimation can be affected by normals.",
+ default= False)
+
+IntProperty( attr="pov_radio_recursion_limit",
+ name="Recursion Limit",
+ description="how many recursion levels are used to calculate the diffuse inter-reflection.",
+ min=1, max=20, default= 3)
+
+
class PovrayRender(bpy.types.RenderEngine):
__idname__ = 'POVRAY_RENDER'
__label__ = "Povray"
DELAY = 0.02
+
def _export(self, scene):
import tempfile
@@ -761,11 +839,8 @@
self._cleanup()
-
bpy.types.register(PovrayRender)
-
-
# Use some of the existing buttons.
import buttons_scene
buttons_scene.SCENE_PT_render.COMPAT_ENGINES.add('POVRAY_RENDER')
@@ -800,89 +875,10 @@
rd = context.scene.render_data
return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
-# Radiosity panel, use in the scene for now.
-FloatProperty= bpy.types.Scene.FloatProperty
-IntProperty= bpy.types.Scene.IntProperty
-BoolProperty= bpy.types.Scene.BoolProperty
-
class SCENE_PT_povray_radiosity(RenderButtonsPanel):
__label__ = "Radiosity"
COMPAT_ENGINES = set(['POVRAY_RENDER'])
- __props__ = [ \
- # Not a real pov option, just to know if we should write
- BoolProperty( attr="pov_radio_enable",
- name="Enable Radiosity",
- description="Enable povrays radiosity calculation.",
- default= False),
- BoolProperty( attr="pov_radio_display_advanced",
- name="Advanced Options",
- description="Show advanced options.",
- default= False),
-
- # Real pov options
- FloatProperty( attr="pov_radio_adc_bailout",
- name="ADC Bailout",
- description="The adc_bailout for radiosity rays. Use adc_bailout = 0.01 / brightest_ambient_object for good results.",
- min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default= 0.01),
-
- BoolProperty( attr="pov_radio_always_sample",
- name="Always Sample",
- description="Only use the data from the pretrace step and not gather any new samples during the final radiosity pass..",
- default= True),
-
- FloatProperty( attr="pov_radio_brightness",
- name="Brightness",
- description="Ammount objects are brightened before being returned upwards to the rest of the system.",
- min=0.0, max=1000.0, soft_min=0.0, soft_max=10.0, default= 1.0),
-
- IntProperty( attr="pov_radio_count",
- name="Ray Count",
- description="number of rays that are sent out whenever a new radiosity value has to be calculated.",
- min=1, max=1600, default= 35),
-
- FloatProperty( attr="pov_radio_error_bound",
- name="Error Bound",
- description="one of the two main speed/quality tuning values, lower values are more accurate.",
- min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default= 1.8),
-
- FloatProperty( attr="pov_radio_gray_threshold",
- name="Gray Threshold",
- description="one of the two main speed/quality tuning values, lower values are more accurate.",
- min=0.0, max=1.0, soft_min=0, soft_max=1, default= 0.0),
-
- FloatProperty( attr="pov_radio_low_error_factor",
- name="Low Error Factor",
- description="If you calculate just enough samples, but no more, you will get an image which has slightly blotchy lighting.",
- min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, default= 0.5),
-
- # max_sample - not available yet
- BoolProperty( attr="pov_radio_media",
- name="Media",
- description="Radiosity estimation can be affected by media.",
- default= False),
-
- FloatProperty( attr="pov_radio_minimum_reuse",
- name="Minimum Reuse",
- description="Fraction of the screen width which sets the minimum radius of reuse for each sample point (At values higher than 2% expect errors).",
- min=0.0, max=1.0, soft_min=0.1, soft_max=0.1, default= 0.015),
-
- IntProperty( attr="pov_radio_nearest_count",
- name="Nearest Count",
- description="Number of old ambient values blended together to create a new interpolated value.",
- min=1, max=20, default= 5),
-
- BoolProperty( attr="pov_radio_normal",
- name="Normals",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list