[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43248] branches/soc-2011-onion-uv-tools: merge with trunk 43246
Antony Riakiotakis
kalast at gmail.com
Mon Jan 9 22:54:13 CET 2012
Revision: 43248
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43248
Author: psy-fi
Date: 2012-01-09 21:54:13 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
merge with trunk 43246
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/CMakeLists.txt
branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/engine.py
branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py
branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/properties.py
branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_python.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_session.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_session.h
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.h
branches/soc-2011-onion-uv-tools/intern/cycles/device/device.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device.h
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_cpu.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_cuda.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_multi.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_network.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/device/device_opencl.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-onion-uv-tools/intern/cycles/render/buffers.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/mesh_displace.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/render/nodes.h
branches/soc-2011-onion-uv-tools/intern/cycles/render/session.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/util/util_progress.h
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf.c
branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_cloth.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_node.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_tracking.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/multires.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/node.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sound.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_color.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_color.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_filter.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_view3d.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_opengl.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screendump.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/divers.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/SConscript
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/SConscript
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_shader.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_common.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-onion-uv-tools/source/blender/python/SConscript
branches/soc-2011-onion-uv-tools/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface.c
branches/soc-2011-onion-uv-tools/source/blender/render/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/renderpipeline.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/external_engine.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rayshade.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rendercore.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/zbuf.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/soc-2011-onion-uv-tools/intern/cycles/blender/CCL_api.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_checker.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/render_result.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/render_result.c
branches/soc-2011-onion-uv-tools/source/tests/bl_mesh_modifiers.py
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,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:39665-43172
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,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:39665-43247
Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt 2012-01-09 21:54:13 UTC (rev 43248)
@@ -270,8 +270,8 @@
message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
endif()
-if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
- message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
+ message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
endif()
# python module, needs some different options
@@ -711,8 +711,8 @@
add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
- set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py 2012-01-09 21:54:13 UTC (rev 43248)
@@ -185,7 +185,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
CXXFLAGS = ['/EHsc']
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py 2012-01-09 21:54:13 UTC (rev 43248)
@@ -190,7 +190,7 @@
CXX = 'cl.exe'
CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp 2012-01-09 21:54:13 UTC (rev 43248)
@@ -349,6 +349,9 @@
else if(string_iequals(node.name(), "noise_texture")) {
snode = new NoiseTextureNode();
}
+ else if(string_iequals(node.name(), "checker_texture")) {
+ snode = new CheckerTextureNode();
+ }
else if(string_iequals(node.name(), "gradient_texture")) {
GradientTextureNode *blend = new GradientTextureNode();
xml_read_enum(&blend->type, GradientTextureNode::type_enum, node, "type");
Copied: branches/soc-2011-onion-uv-tools/intern/cycles/blender/CCL_api.h (from rev 43247, trunk/blender/intern/cycles/blender/CCL_api.h)
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/CCL_api.h (rev 0)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/CCL_api.h 2012-01-09 21:54:13 UTC (rev 43248)
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef CCL_API_H
+#define CCL_API_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* returns a list of devices for selection, array is name NULL pointer
+ * terminated and must not be freed */
+
+typedef struct CCLDeviceInfo {
+ const char *identifier;
+ const char *name;
+ int value;
+} CCLDeviceInfo;
+
+CCLDeviceInfo *CCL_compute_device_list(int opencl);
+
+/* create python module _cycles used by addon */
+
+void *CCL_python_module_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CCL_API_H */
+
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/CMakeLists.txt 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/CMakeLists.txt 2012-01-09 21:54:13 UTC (rev 43248)
@@ -27,6 +27,7 @@
blender_shader.cpp
blender_sync.cpp
+ CCL_api.h
blender_sync.h
blender_session.h
blender_util.h
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/engine.py
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/engine.py 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/engine.py 2012-01-09 21:54:13 UTC (rev 43248)
@@ -35,6 +35,7 @@
import _cycles
data = data.as_pointer()
+ userpref = bpy.context.user_preferences.as_pointer()
scene = scene.as_pointer()
if region:
region = region.as_pointer()
@@ -43,7 +44,7 @@
if rv3d:
rv3d = rv3d.as_pointer()
- engine.session = _cycles.create(engine.as_pointer(), data, scene, region, v3d, rv3d)
+ engine.session = _cycles.create(engine.as_pointer(), userpref, data, scene, region, v3d, rv3d)
def free(engine):
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/enums.py 2012-01-09 21:54:13 UTC (rev 43248)
@@ -20,30 +20,10 @@
from . import engine
-
-def get_gpu_device():
- available_devices = engine.available_devices()
- cuda = 'cuda' in available_devices
- opencl = 'opencl' in available_devices
- if cuda and opencl:
- gpu_string = "GPU"
- elif cuda and not opencl:
- gpu_string = "CUDA GPU"
- else:
- gpu_string = "OpenCL GPU"
-
- return gpu_string
-
devices = (
- ("CPU", "CPU", "Processor"),
- ("GPU", get_gpu_device(), "Graphics card"),
- )
+ ("CPU", "CPU", "Use CPU for rendering"),
+ ("GPU", "GPU Compute", "Use GPU compute device for rendering, configured in user preferences"))
-gpu_type = (
- ("CUDA", "CUDA", "NVidia only"),
- ("OPENCL", "OpenCL", ""),
- )
-
feature_set = (
("SUPPORTED", "Supported", "Only use finished and supported features"),
("EXPERIMENTAL", "Experimental", "Use experimental and incomplete features that might be broken or change in the future"),
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/properties.py 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/properties.py 2012-01-09 21:54:13 UTC (rev 43248)
@@ -38,9 +38,6 @@
cls.device = EnumProperty(name="Device", description="Device to use for rendering",
items=enums.devices, default="CPU")
- cls.gpu_type = EnumProperty(name="GPU Type", description="Processing system to use on the GPU",
- items=enums.gpu_type, default="CUDA")
-
cls.feature_set = EnumProperty(name="Feature Set", description="Feature set to use for rendering",
items=enums.feature_set, default="SUPPORTED")
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py 2012-01-09 21:45:12 UTC (rev 43247)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py 2012-01-09 21:54:13 UTC (rev 43248)
@@ -148,7 +148,6 @@
sub.prop(cscene, "debug_bvh_type", text="")
sub.prop(cscene, "debug_use_spatial_splits")
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list