[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57418] branches/multiview: multiview : merging from github branch
Dalai Felinto
dfelinto at gmail.com
Thu Jun 13 01:17:32 CEST 2013
Revision: 57418
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57418
Author: dfelinto
Date: 2013-06-12 23:17:31 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
multiview : merging from github branch
NOTE: this is the version of the third patch sent for review
(with FSA fix)
(or better, the version used for the git pull)
github: e0e5ef853d352dd70fc82a4f4d9674e4157f19ad
http://github.com/dfelinto/blender/tree/multiview
note: this is trunk/svn revision: 57417
Modified Paths:
--------------
branches/multiview/CMakeLists.txt
branches/multiview/build_files/scons/tools/btools.py
branches/multiview/doc/guides/interface_API.txt
branches/multiview/intern/cycles/blender/addon/__init__.py
branches/multiview/intern/cycles/blender/addon/properties.py
branches/multiview/intern/cycles/blender/addon/ui.py
branches/multiview/intern/cycles/blender/blender_object.cpp
branches/multiview/intern/cycles/blender/blender_python.cpp
branches/multiview/intern/cycles/blender/blender_session.cpp
branches/multiview/intern/cycles/blender/blender_shader.cpp
branches/multiview/intern/cycles/blender/blender_sync.cpp
branches/multiview/intern/cycles/blender/blender_sync.h
branches/multiview/intern/cycles/kernel/CMakeLists.txt
branches/multiview/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
branches/multiview/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/multiview/intern/cycles/kernel/closure/bssrdf.h
branches/multiview/intern/cycles/kernel/kernel_accumulate.h
branches/multiview/intern/cycles/kernel/kernel_bvh.h
branches/multiview/intern/cycles/kernel/kernel_camera.h
branches/multiview/intern/cycles/kernel/kernel_compat_cpu.h
branches/multiview/intern/cycles/kernel/kernel_compat_opencl.h
branches/multiview/intern/cycles/kernel/kernel_displace.h
branches/multiview/intern/cycles/kernel/kernel_emission.h
branches/multiview/intern/cycles/kernel/kernel_globals.h
branches/multiview/intern/cycles/kernel/kernel_light.h
branches/multiview/intern/cycles/kernel/kernel_montecarlo.h
branches/multiview/intern/cycles/kernel/kernel_object.h
branches/multiview/intern/cycles/kernel/kernel_passes.h
branches/multiview/intern/cycles/kernel/kernel_path.h
branches/multiview/intern/cycles/kernel/kernel_random.h
branches/multiview/intern/cycles/kernel/kernel_shader.h
branches/multiview/intern/cycles/kernel/kernel_types.h
branches/multiview/intern/cycles/kernel/osl/osl_closures.cpp
branches/multiview/intern/cycles/kernel/osl/osl_services.cpp
branches/multiview/intern/cycles/kernel/shaders/CMakeLists.txt
branches/multiview/intern/cycles/kernel/shaders/node_color.h
branches/multiview/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/multiview/intern/cycles/kernel/shaders/node_texture_coordinate.osl
branches/multiview/intern/cycles/kernel/shaders/stdosl.h
branches/multiview/intern/cycles/kernel/svm/svm.h
branches/multiview/intern/cycles/kernel/svm/svm_brick.h
branches/multiview/intern/cycles/kernel/svm/svm_checker.h
branches/multiview/intern/cycles/kernel/svm/svm_closure.h
branches/multiview/intern/cycles/kernel/svm/svm_convert.h
branches/multiview/intern/cycles/kernel/svm/svm_fresnel.h
branches/multiview/intern/cycles/kernel/svm/svm_hsv.h
branches/multiview/intern/cycles/kernel/svm/svm_image.h
branches/multiview/intern/cycles/kernel/svm/svm_mix.h
branches/multiview/intern/cycles/kernel/svm/svm_musgrave.h
branches/multiview/intern/cycles/kernel/svm/svm_noise.h
branches/multiview/intern/cycles/kernel/svm/svm_ramp.h
branches/multiview/intern/cycles/kernel/svm/svm_sky.h
branches/multiview/intern/cycles/kernel/svm/svm_tex_coord.h
branches/multiview/intern/cycles/kernel/svm/svm_texture.h
branches/multiview/intern/cycles/kernel/svm/svm_types.h
branches/multiview/intern/cycles/kernel/svm/svm_value.h
branches/multiview/intern/cycles/render/background.cpp
branches/multiview/intern/cycles/render/background.h
branches/multiview/intern/cycles/render/film.cpp
branches/multiview/intern/cycles/render/film.h
branches/multiview/intern/cycles/render/integrator.cpp
branches/multiview/intern/cycles/render/integrator.h
branches/multiview/intern/cycles/render/light.cpp
branches/multiview/intern/cycles/render/light.h
branches/multiview/intern/cycles/render/nodes.cpp
branches/multiview/intern/cycles/render/nodes.h
branches/multiview/intern/cycles/render/session.cpp
branches/multiview/intern/cycles/util/util_color.h
branches/multiview/intern/cycles/util/util_math.h
branches/multiview/intern/cycles/util/util_types.h
branches/multiview/release/scripts/modules/bpy/utils.py
branches/multiview/release/scripts/presets/interface_theme/back_to_black.xml
branches/multiview/release/scripts/presets/interface_theme/blender_24x.xml
branches/multiview/release/scripts/presets/interface_theme/elsyiun.xml
branches/multiview/release/scripts/presets/interface_theme/hexagon.xml
branches/multiview/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/multiview/release/scripts/startup/bl_operators/node.py
branches/multiview/release/scripts/startup/bl_operators/view3d.py
branches/multiview/release/scripts/startup/bl_operators/wm.py
branches/multiview/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/multiview/release/scripts/startup/bl_ui/properties_freestyle.py
branches/multiview/release/scripts/startup/bl_ui/space_dopesheet.py
branches/multiview/release/scripts/startup/bl_ui/space_info.py
branches/multiview/release/scripts/startup/bl_ui/space_userpref.py
branches/multiview/release/scripts/startup/bl_ui/space_view3d.py
branches/multiview/release/scripts/startup/nodeitems_builtins.py
branches/multiview/release/scripts/templates_py/custom_nodes.py
branches/multiview/source/blender/blenfont/intern/blf_glyph.c
branches/multiview/source/blender/blenfont/intern/blf_internal.h
branches/multiview/source/blender/blenkernel/BKE_blender.h
branches/multiview/source/blender/blenkernel/BKE_global.h
branches/multiview/source/blender/blenkernel/BKE_lattice.h
branches/multiview/source/blender/blenkernel/BKE_mask.h
branches/multiview/source/blender/blenkernel/BKE_mesh.h
branches/multiview/source/blender/blenkernel/BKE_node.h
branches/multiview/source/blender/blenkernel/BKE_object.h
branches/multiview/source/blender/blenkernel/BKE_tracking.h
branches/multiview/source/blender/blenkernel/intern/DerivedMesh.c
branches/multiview/source/blender/blenkernel/intern/anim_sys.c
branches/multiview/source/blender/blenkernel/intern/blender.c
branches/multiview/source/blender/blenkernel/intern/cdderivedmesh.c
branches/multiview/source/blender/blenkernel/intern/constraint.c
branches/multiview/source/blender/blenkernel/intern/context.c
branches/multiview/source/blender/blenkernel/intern/lamp.c
branches/multiview/source/blender/blenkernel/intern/lattice.c
branches/multiview/source/blender/blenkernel/intern/library.c
branches/multiview/source/blender/blenkernel/intern/mask.c
branches/multiview/source/blender/blenkernel/intern/material.c
branches/multiview/source/blender/blenkernel/intern/mesh.c
branches/multiview/source/blender/blenkernel/intern/nla.c
branches/multiview/source/blender/blenkernel/intern/node.c
branches/multiview/source/blender/blenkernel/intern/object.c
branches/multiview/source/blender/blenkernel/intern/scene.c
branches/multiview/source/blender/blenkernel/intern/texture.c
branches/multiview/source/blender/blenkernel/intern/tracking.c
branches/multiview/source/blender/blenkernel/intern/world.c
branches/multiview/source/blender/blenlib/BLI_math_geom.h
branches/multiview/source/blender/blenlib/BLI_rect.h
branches/multiview/source/blender/blenlib/intern/math_geom.c
branches/multiview/source/blender/blenlib/intern/rct.c
branches/multiview/source/blender/bmesh/intern/bmesh_core.c
branches/multiview/source/blender/bmesh/intern/bmesh_interp.c
branches/multiview/source/blender/bmesh/intern/bmesh_opdefines.c
branches/multiview/source/blender/bmesh/intern/bmesh_operators.h
branches/multiview/source/blender/bmesh/operators/bmo_subdivide.c
branches/multiview/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/multiview/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/multiview/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/multiview/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/multiview/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/multiview/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/multiview/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/multiview/source/blender/editors/animation/anim_filter.c
branches/multiview/source/blender/editors/armature/armature_ops.c
branches/multiview/source/blender/editors/armature/meshlaplacian.c
branches/multiview/source/blender/editors/curve/curve_ops.c
branches/multiview/source/blender/editors/curve/editcurve.c
branches/multiview/source/blender/editors/gpencil/gpencil_edit.c
branches/multiview/source/blender/editors/include/ED_object.h
branches/multiview/source/blender/editors/include/UI_interface.h
branches/multiview/source/blender/editors/include/UI_resources.h
branches/multiview/source/blender/editors/interface/interface.c
branches/multiview/source/blender/editors/interface/interface_handlers.c
branches/multiview/source/blender/editors/interface/interface_intern.h
branches/multiview/source/blender/editors/interface/interface_layout.c
branches/multiview/source/blender/editors/interface/interface_ops.c
branches/multiview/source/blender/editors/interface/interface_regions.c
branches/multiview/source/blender/editors/interface/interface_style.c
branches/multiview/source/blender/editors/interface/interface_utils.c
branches/multiview/source/blender/editors/interface/interface_widgets.c
branches/multiview/source/blender/editors/interface/resources.c
branches/multiview/source/blender/editors/mask/mask_shapekey.c
branches/multiview/source/blender/editors/mesh/editface.c
branches/multiview/source/blender/editors/mesh/editmesh_extrude.c
branches/multiview/source/blender/editors/mesh/editmesh_loopcut.c
branches/multiview/source/blender/editors/mesh/editmesh_tools.c
branches/multiview/source/blender/editors/object/object_group.c
branches/multiview/source/blender/editors/object/object_lattice.c
branches/multiview/source/blender/editors/object/object_vgroup.c
branches/multiview/source/blender/editors/render/render_internal.c
branches/multiview/source/blender/editors/render/render_update.c
branches/multiview/source/blender/editors/screen/area.c
branches/multiview/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/multiview/source/blender/editors/sculpt_paint/sculpt.c
branches/multiview/source/blender/editors/space_clip/clip_draw.c
branches/multiview/source/blender/editors/space_file/filesel.c
branches/multiview/source/blender/editors/space_file/space_file.c
branches/multiview/source/blender/editors/space_graph/graph_edit.c
branches/multiview/source/blender/editors/space_nla/nla_channels.c
branches/multiview/source/blender/editors/space_nla/nla_edit.c
branches/multiview/source/blender/editors/space_nla/nla_intern.h
branches/multiview/source/blender/editors/space_node/drawnode.c
branches/multiview/source/blender/editors/space_node/node_add.c
branches/multiview/source/blender/editors/space_node/node_edit.c
branches/multiview/source/blender/editors/space_script/script_edit.c
branches/multiview/source/blender/editors/space_script/script_intern.h
branches/multiview/source/blender/editors/space_script/script_ops.c
branches/multiview/source/blender/editors/space_view3d/drawarmature.c
branches/multiview/source/blender/editors/space_view3d/drawobject.c
branches/multiview/source/blender/editors/space_view3d/view3d_buttons.c
branches/multiview/source/blender/editors/space_view3d/view3d_fly.c
branches/multiview/source/blender/editors/space_view3d/view3d_snap.c
branches/multiview/source/blender/editors/transform/transform_conversions.c
branches/multiview/source/blender/editors/transform/transform_generics.c
branches/multiview/source/blender/editors/transform/transform_manipulator.c
branches/multiview/source/blender/freestyle/FRS_freestyle.h
branches/multiview/source/blender/freestyle/intern/application/Controller.cpp
branches/multiview/source/blender/freestyle/intern/application/Controller.h
branches/multiview/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/multiview/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/multiview/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/multiview/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/multiview/source/blender/makesdna/DNA_action_types.h
branches/multiview/source/blender/makesdna/DNA_lattice_types.h
branches/multiview/source/blender/makesdna/DNA_meshdata_types.h
branches/multiview/source/blender/makesdna/DNA_userdef_types.h
branches/multiview/source/blender/makesrna/intern/rna_action.c
branches/multiview/source/blender/makesrna/intern/rna_lamp.c
branches/multiview/source/blender/makesrna/intern/rna_modifier.c
branches/multiview/source/blender/makesrna/intern/rna_nodetree.c
branches/multiview/source/blender/makesrna/intern/rna_render.c
branches/multiview/source/blender/makesrna/intern/rna_scene.c
branches/multiview/source/blender/makesrna/intern/rna_screen.c
branches/multiview/source/blender/makesrna/intern/rna_space.c
branches/multiview/source/blender/makesrna/intern/rna_userdef.c
branches/multiview/source/blender/modifiers/intern/MOD_displace.c
branches/multiview/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/multiview/source/blender/modifiers/intern/MOD_ocean.c
branches/multiview/source/blender/modifiers/intern/MOD_solidify.c
branches/multiview/source/blender/modifiers/intern/MOD_wave.c
branches/multiview/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/multiview/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/multiview/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/multiview/source/blender/nodes/CMakeLists.txt
branches/multiview/source/blender/nodes/NOD_composite.h
branches/multiview/source/blender/nodes/NOD_shader.h
branches/multiview/source/blender/nodes/NOD_static_types.h
branches/multiview/source/blender/nodes/composite/node_composite_tree.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_image.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/multiview/source/blender/nodes/intern/node_common.c
branches/multiview/source/blender/python/BPY_extern.h
branches/multiview/source/blender/python/intern/bpy_app.c
branches/multiview/source/blender/python/intern/bpy_driver.c
branches/multiview/source/blender/python/intern/bpy_interface.c
branches/multiview/source/blender/render/extern/include/RE_engine.h
branches/multiview/source/blender/render/extern/include/RE_pipeline.h
branches/multiview/source/blender/render/intern/source/external_engine.c
branches/multiview/source/blender/render/intern/source/pipeline.c
branches/multiview/source/blender/render/intern/source/render_result.c
branches/multiview/source/blender/render/intern/source/shadbuf.c
branches/multiview/source/blender/windowmanager/SConscript
branches/multiview/source/blender/windowmanager/intern/wm_event_system.c
branches/multiview/source/blender/windowmanager/intern/wm_files.c
branches/multiview/source/blender/windowmanager/intern/wm_init_exit.c
branches/multiview/source/blender/windowmanager/intern/wm_operators.c
branches/multiview/source/creator/creator.c
branches/multiview/source/tools/update_themes.py
Added Paths:
-----------
branches/multiview/intern/cycles/kernel/kernel_jitter.h
branches/multiview/intern/cycles/kernel/shaders/node_wavelength.osl
branches/multiview/intern/cycles/kernel/svm/svm_wavelength.h
branches/multiview/source/blender/nodes/shader/nodes/node_shader_wavelength.c
Modified: branches/multiview/CMakeLists.txt
===================================================================
--- branches/multiview/CMakeLists.txt 2013-06-12 20:47:48 UTC (rev 57417)
+++ branches/multiview/CMakeLists.txt 2013-06-12 23:17:31 UTC (rev 57418)
@@ -118,9 +118,10 @@
option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
-option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a security issue, rather than have them patch it, make a build option.
+set(WITH_PYTHON_SECURITY ON CACHE BOOL "ON" FORCE) # temp force on.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
Modified: branches/multiview/build_files/scons/tools/btools.py
===================================================================
--- branches/multiview/build_files/scons/tools/btools.py 2013-06-12 20:47:48 UTC (rev 57417)
+++ branches/multiview/build_files/scons/tools/btools.py 2013-06-12 23:17:31 UTC (rev 57418)
@@ -96,7 +96,7 @@
def validate_arguments(args, bc):
opts_list = [
- 'WITH_BF_FREESTYLE', 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LIBPATH_ARCH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
+ 'WITH_BF_FREESTYLE', 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'WITH_BF_PYTHON_SECURITY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LIBPATH_ARCH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'WITH_BF_JACK_DYNLOAD',
@@ -254,6 +254,7 @@
('LIBDIR', 'Root dir of libs'),
(BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
(BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)),
+ (BoolVariable('WITH_BF_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default', True)),
('BF_PYTHON', 'Base path for python', ''),
('BF_PYTHON_VERSION', 'Python version to use', ''),
('BF_PYTHON_INC', 'Include path for Python headers', ''),
Modified: branches/multiview/doc/guides/interface_API.txt
===================================================================
--- branches/multiview/doc/guides/interface_API.txt 2013-06-12 20:47:48 UTC (rev 57417)
+++ branches/multiview/doc/guides/interface_API.txt 2013-06-12 23:17:31 UTC (rev 57418)
@@ -19,26 +19,22 @@
4. API for uiButton
4.1 UiDefBut
1. BUT
- 2. TOG or TOGN or TOGR
+ 2. TOG or TOGN
TOG|BIT|<nr>
- 3. TOG3|BIT|<nr>
- 4. ROW
- 5. SLI or NUMSLI or HSVSLI
- 6. NUM
- 7. TEX
- 8. LABEL
- 9 SEPR
- 10. MENU
- 11. COL
+ 3. ROW
+ 4. NUMSLI or HSVSLI
+ 5. NUM
+ 6. TEX
+ 7. LABEL
+ 8 SEPR
+ 9. MENU
+ 10. COL
4.2 Icon buttons
- 12. ICONROW
- 13. ICONTEXTROW
4.3 pulldown menus / block buttons
14. BLOCK
4.4 specials
15. KEYEVT
16. LINK and INLINK
- 17. IDPOIN
4.5 uiButton control fuctions
@@ -289,55 +285,49 @@
Activation button. (like "Render")
Passing on a pointer is not needed
-2. TOG or TOGN or TOGR
+2. TOG or TOGN
Toggle button (like "Lock")
The pointer value is set either at 0 or 1
If pressed, it calls the optional function with arguments provided.
Type TOGN: works negative, when pressed it sets at 0
- Type TOGR: is part of a row, redraws automatically all buttons with same *poin
"|BIT|<nr>"
When added to type, it works on a single bit <nr> (lowest order bit: nr = '0')
-3. TOG3|BIT|<nr>
- A toggle with 3 values!
- Can be only used for short *poin.
- In the third toggle setting, the bit <nr> of *( poin+1) is set.
-
-4. ROW
+3. ROW
Button that's part of a row.
in "min" you set a row-id number, in "max" the value you want *poin to be
assigned when you press the button. Always pass on these values as floats.
When this button is pressed, it sets the "max" value to *poin, and redraws
all buttons with the same row-id number.
-5. SLI or NUMSLI or HSVSLI
- Slider, number-slider or hsv-slider button.
+4. NUMSLI or HSVSLI
+ Number-slider or hsv-slider button.
"min" and "max" are to clamp the value to.
If you want a button type "Col" to be updated, make 'a1' equal to 'retval'
from the COL button.
-6. NUM
+5. NUM
Number button
Set the clamping values 'min' and 'max' always as float.
For UiDefButF, set a 'step' in 'a1', in 1/100's. The step value is the increment or
decrement when you click once on the right or left side of a button.
The optional button function is additionally called for each change of the *poin value.
-7. TEX
+6. TEX
Text string button.
Pointertype is standard a char. Value 'max' is length of string (pass as float).
When button is left with ESC, it doesn't put the 'retval' at the queue.
-8. LABEL
+7. LABEL
Label button.
Only displays text.
If 'min' is set at 1.0, the text is printed in white.
-9 SEPR
+8 SEPR
A separator line, typically used within pulldown menus.
-10. MENU
+9. MENU
Menu button.
The syntax of the string in *name defines the menu items:
- %t means the previous text becomes the title
@@ -346,7 +336,7 @@
without returnvalues, the first item gets value 0 (incl. title!)
Example: "Do something %t| turn left %2| turn right %1| nothing %0"
-11. COLOR
+10. COLOR
A special button that only visualizes a RGB value
In 'retval' you can put a code, which is used to identify for sliders if it needs
redraws while using the sliders. Check button '5'.
@@ -371,20 +361,7 @@
Same again, but now with an icon and string as button name.
-Two special icon buttons are available in Blender:
-12. ICONROW
- (uiDefIconBut)
- This button pops up a vertical menu with a row of icons to choose from.
- 'max' = amount of icons. The icons are supposed to be ordered in a sequence
- It writes in *poin which item in the menu was choosen (starting with 0).
-
-13. ICONTEXTROW
- (uiDefIconTextBut)
- Same as previous, but with the texts next to it.
-
-
-
-----------4.3 pulldown menus / block buttons
14. BLOCK
@@ -465,37 +442,6 @@
-17. IDPOIN
-void uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, int retval, char *str,
- short x1, short y1, short x2, short y2, void *idpp, char *tip)
-
- The ID struct is a generic part in structs like Object, Material, Mesh, etc.
- Most linking options in Blender happens using ID's. (Mesh -> Material).
-
- This special button in Blender visualizes an ID pointer with its name. Typing in
- a new name, changes the pointer. For most ID types in Blender functions have been
- written already, needed by this button, to check validity of names, and assign the pointer.
-
- (BTW: the 'void *idpp' has to be a pointer to the ID pointer!)
-
- Example function that can be put in 'func':
-
- void test_scriptpoin_but(char *name, ID **idpp)
- {
- ID *id;
-
- id= G.main->text.first;
- while(id) {
- if( strcmp(name, id->name+2)==0 ) {
- *idpp= id;
- return;
- }
- id= id->next;
- }
- *idpp= 0;
- }
-
-
------------- 4.5 uiButton control fuctions
Modified: branches/multiview/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/multiview/intern/cycles/blender/addon/__init__.py 2013-06-12 20:47:48 UTC (rev 57417)
+++ branches/multiview/intern/cycles/blender/addon/__init__.py 2013-06-12 23:17:31 UTC (rev 57418)
@@ -40,6 +40,7 @@
bl_label = "Cycles Render"
bl_use_shading_nodes = True
bl_use_preview = True
+ bl_use_exclude_layers = True
def __init__(self):
self.session = None
Modified: branches/multiview/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/multiview/intern/cycles/blender/addon/properties.py 2013-06-12 20:47:48 UTC (rev 57417)
+++ branches/multiview/intern/cycles/blender/addon/properties.py 2013-06-12 23:17:31 UTC (rev 57418)
@@ -114,7 +114,12 @@
('IGNORE', "Ignore", "Ignore per render layer number of samples"),
)
+enum_sampling_pattern = (
+ ('SOBOL', "Sobol", "Use Sobol random sampling pattern"),
+ ('CORRELATED_MUTI_JITTER', "Correlated Multi-Jitter", "Use Correlated Multi-Jitter random sampling pattern"),
+ )
+
class CyclesRenderSettings(bpy.types.PropertyGroup):
@classmethod
def register(cls):
@@ -219,6 +224,13 @@
default=1,
)
+ cls.sampling_pattern = EnumProperty(
+ name="Sampling Pattern",
+ description="Random sampling pattern used by the integrator",
+ items=enum_sampling_pattern,
+ default='SOBOL',
+ )
+
cls.use_layer_samples = EnumProperty(
name="Layer Samples",
description="How to use per render layer sample settings",
@@ -577,6 +589,12 @@
type=cls,
)
+ bpy.types.World.cycles_visibility = PointerProperty(
+ name="Cycles Visibility Settings",
+ description="Cycles visibility settings",
+ type=cls,
+ )
+
cls.camera = BoolProperty(
name="Camera",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list