[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57366] branches/soc-2013-dingto: SVN merge r57320-57365 into soc-2013-dingto
Thomas Dinges
blender at dingto.org
Mon Jun 10 23:16:30 CEST 2013
Revision: 57366
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57366
Author: dingto
Date: 2013-06-10 21:16:29 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
SVN merge r57320-57365 into soc-2013-dingto
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57320
Modified Paths:
--------------
branches/soc-2013-dingto/CMakeLists.txt
branches/soc-2013-dingto/build_files/scons/tools/btools.py
branches/soc-2013-dingto/intern/cycles/blender/addon/__init__.py
branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_python.cpp
branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2013-dingto/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-dingto/intern/cycles/render/background.cpp
branches/soc-2013-dingto/intern/cycles/render/background.h
branches/soc-2013-dingto/intern/cycles/render/integrator.cpp
branches/soc-2013-dingto/release/scripts/startup/bl_operators/view3d.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_global.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mask.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/context.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mask.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/scene.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-dingto/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-dingto/source/blender/editors/animation/anim_filter.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_ops.c
branches/soc-2013-dingto/source/blender/editors/curve/curve_ops.c
branches/soc-2013-dingto/source/blender/editors/curve/editcurve.c
branches/soc-2013-dingto/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_shapekey.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/object/object_lattice.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_edit.c
branches/soc-2013-dingto/source/blender/editors/space_script/script_edit.c
branches/soc-2013-dingto/source/blender/editors/space_script/script_intern.h
branches/soc-2013-dingto/source/blender/editors/space_script/script_ops.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2013-dingto/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2013-dingto/source/blender/makesdna/DNA_action_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_action.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_screen.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2013-dingto/source/blender/nodes/intern/node_common.c
branches/soc-2013-dingto/source/blender/python/BPY_extern.h
branches/soc-2013-dingto/source/blender/python/intern/bpy_app.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_driver.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_interface.c
branches/soc-2013-dingto/source/blender/render/extern/include/RE_engine.h
branches/soc-2013-dingto/source/blender/render/intern/source/external_engine.c
branches/soc-2013-dingto/source/blender/windowmanager/SConscript
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-dingto/source/creator/creator.c
Property Changed:
----------------
branches/soc-2013-dingto/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57319
+ /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,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365
Modified: branches/soc-2013-dingto/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/CMakeLists.txt 2013-06-10 20:54:08 UTC (rev 57365)
+++ branches/soc-2013-dingto/CMakeLists.txt 2013-06-10 21:16:29 UTC (rev 57366)
@@ -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/soc-2013-dingto/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/tools/btools.py 2013-06-10 20:54:08 UTC (rev 57365)
+++ branches/soc-2013-dingto/build_files/scons/tools/btools.py 2013-06-10 21:16:29 UTC (rev 57366)
@@ -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/soc-2013-dingto/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/__init__.py 2013-06-10 20:54:08 UTC (rev 57365)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/__init__.py 2013-06-10 21:16:29 UTC (rev 57366)
@@ -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/soc-2013-dingto/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py 2013-06-10 20:54:08 UTC (rev 57365)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py 2013-06-10 21:16:29 UTC (rev 57366)
@@ -589,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",
description="Object visibility for camera rays",
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-06-10 20:54:08 UTC (rev 57365)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-06-10 21:16:29 UTC (rev 57366)
@@ -542,9 +542,11 @@
flow.prop(visibility, "diffuse")
flow.prop(visibility, "glossy")
flow.prop(visibility, "transmission")
- flow.prop(visibility, "shadow")
+ if ob.type != 'LAMP':
+ flow.prop(visibility, "shadow")
+
def find_node(material, nodetype):
if material and material.node_tree:
ntree = material.node_tree
@@ -777,6 +779,29 @@
layout.prop(world.mist_settings, "falloff")
+class CyclesWorld_PT_ray_visibility(CyclesButtonsPanel, Panel):
+ bl_label = "Ray Visibility"
+ bl_context = "world"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ return CyclesButtonsPanel.poll(context) and context.world
+
+ def draw(self, context):
+ layout = self.layout
+
+ world = context.world
+ visibility = world.cycles_visibility
+
+ flow = layout.column_flow()
+
+ flow.prop(visibility, "camera")
+ flow.prop(visibility, "diffuse")
+ flow.prop(visibility, "glossy")
+ flow.prop(visibility, "transmission")
+
+
class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel):
bl_label = "Settings"
bl_context = "world"
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_python.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_python.cpp 2013-06-10 20:54:08 UTC (rev 57365)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_python.cpp 2013-06-10 21:16:29 UTC (rev 57366)
@@ -317,11 +317,6 @@
b_node.outputs.remove(b_sock);
b_sock = BL::NodeSocket(PointerRNA_NULL);
}
-
- if (!b_sock) {
- /* create new socket */
- b_sock = b_node.outputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
- }
}
else {
b_sock = b_node.inputs[param->name];
@@ -331,15 +326,16 @@
b_node.inputs.remove(b_sock);
b_sock = BL::NodeSocket(PointerRNA_NULL);
}
-
- if (!b_sock) {
- /* create new socket */
- b_sock = b_node.inputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
- }
}
- /* set default value */
- if(b_sock) {
+ if(!b_sock) {
+ /* create new socket */
+ if(param->isoutput)
+ b_sock = b_node.outputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
+ else
+ b_sock = b_node.inputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
+
+ /* set default value */
if(data_type == BL::NodeSocket::type_VALUE) {
set_float(b_sock.ptr, "default_value", default_float);
}
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp 2013-06-10 20:54:08 UTC (rev 57365)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp 2013-06-10 21:16:29 UTC (rev 57366)
@@ -708,10 +708,13 @@
graph->add(proxy);
}
}
- else if (b_node->is_a(&RNA_ShaderNodeGroup)) {
+ else if (b_node->is_a(&RNA_ShaderNodeGroup) || b_node->is_a(&RNA_NodeCustomGroup)) {
- BL::NodeGroup b_gnode(*b_node);
- BL::ShaderNodeTree b_group_ntree(b_gnode.node_tree());
+ BL::ShaderNodeTree b_group_ntree(PointerRNA_NULL);
+ if (b_node->is_a(&RNA_ShaderNodeGroup))
+ b_group_ntree = BL::ShaderNodeTree(((BL::NodeGroup)(*b_node)).node_tree());
+ else
+ b_group_ntree = BL::ShaderNodeTree(((BL::NodeCustomGroup)(*b_node)).node_tree());
ProxyMap group_proxy_input_map, group_proxy_output_map;
/* Add a proxy node for each socket
@@ -895,8 +898,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list