[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43280] branches/carve_booleans: Merging r43209 through r43279 from trunk into carve_booleans

Sergey Sharybin sergey.vfx at gmail.com
Wed Jan 11 08:19:38 CET 2012


Revision: 43280
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43280
Author:   nazgul
Date:     2012-01-11 07:19:32 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Merging r43209 through r43279 from trunk into carve_booleans

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

Modified Paths:
--------------
    branches/carve_booleans/build_files/cmake/RpmBuild.cmake
    branches/carve_booleans/build_files/scons/config/freebsd7-config.py
    branches/carve_booleans/build_files/scons/config/freebsd8-config.py
    branches/carve_booleans/build_files/scons/config/freebsd9-config.py
    branches/carve_booleans/build_files/scons/config/linux-config.py
    branches/carve_booleans/build_files/scons/tools/btools.py
    branches/carve_booleans/intern/cycles/app/cycles_xml.cpp
    branches/carve_booleans/intern/cycles/blender/CMakeLists.txt
    branches/carve_booleans/intern/cycles/blender/addon/engine.py
    branches/carve_booleans/intern/cycles/blender/addon/enums.py
    branches/carve_booleans/intern/cycles/blender/addon/properties.py
    branches/carve_booleans/intern/cycles/blender/addon/ui.py
    branches/carve_booleans/intern/cycles/blender/blender_python.cpp
    branches/carve_booleans/intern/cycles/blender/blender_session.cpp
    branches/carve_booleans/intern/cycles/blender/blender_session.h
    branches/carve_booleans/intern/cycles/blender/blender_shader.cpp
    branches/carve_booleans/intern/cycles/blender/blender_sync.cpp
    branches/carve_booleans/intern/cycles/blender/blender_sync.h
    branches/carve_booleans/intern/cycles/device/device.cpp
    branches/carve_booleans/intern/cycles/device/device.h
    branches/carve_booleans/intern/cycles/device/device_cpu.cpp
    branches/carve_booleans/intern/cycles/device/device_cuda.cpp
    branches/carve_booleans/intern/cycles/device/device_multi.cpp
    branches/carve_booleans/intern/cycles/device/device_network.cpp
    branches/carve_booleans/intern/cycles/device/device_opencl.cpp
    branches/carve_booleans/intern/cycles/kernel/CMakeLists.txt
    branches/carve_booleans/intern/cycles/kernel/svm/svm.h
    branches/carve_booleans/intern/cycles/kernel/svm/svm_types.h
    branches/carve_booleans/intern/cycles/render/buffers.cpp
    branches/carve_booleans/intern/cycles/render/mesh_displace.cpp
    branches/carve_booleans/intern/cycles/render/nodes.cpp
    branches/carve_booleans/intern/cycles/render/nodes.h
    branches/carve_booleans/intern/cycles/render/session.cpp
    branches/carve_booleans/intern/cycles/util/util_progress.h
    branches/carve_booleans/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/carve_booleans/release/scripts/modules/bpy/utils.py
    branches/carve_booleans/release/scripts/modules/rna_xml.py
    branches/carve_booleans/release/scripts/startup/bl_operators/mesh.py
    branches/carve_booleans/release/scripts/startup/bl_operators/presets.py
    branches/carve_booleans/release/scripts/startup/bl_operators/wm.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_clip.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_logic.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_node.py
    branches/carve_booleans/release/scripts/startup/bl_ui/space_userpref.py
    branches/carve_booleans/source/blender/blenfont/intern/blf_lang.c
    branches/carve_booleans/source/blender/blenkernel/BKE_blender.h
    branches/carve_booleans/source/blender/blenkernel/BKE_cloth.h
    branches/carve_booleans/source/blender/blenkernel/BKE_node.h
    branches/carve_booleans/source/blender/blenkernel/BKE_tracking.h
    branches/carve_booleans/source/blender/blenkernel/intern/DerivedMesh.c
    branches/carve_booleans/source/blender/blenkernel/intern/cloth.c
    branches/carve_booleans/source/blender/blenkernel/intern/movieclip.c
    branches/carve_booleans/source/blender/blenkernel/intern/multires.c
    branches/carve_booleans/source/blender/blenkernel/intern/node.c
    branches/carve_booleans/source/blender/blenkernel/intern/scene.c
    branches/carve_booleans/source/blender/blenkernel/intern/softbody.c
    branches/carve_booleans/source/blender/blenkernel/intern/tracking.c
    branches/carve_booleans/source/blender/blenlib/BLI_math_color.h
    branches/carve_booleans/source/blender/blenlib/BLI_utildefines.h
    branches/carve_booleans/source/blender/blenlib/intern/math_color.c
    branches/carve_booleans/source/blender/blenlib/intern/math_color_inline.c
    branches/carve_booleans/source/blender/blenloader/intern/readfile.c
    branches/carve_booleans/source/blender/editors/datafiles/Bfont.c
    branches/carve_booleans/source/blender/editors/include/ED_view3d.h
    branches/carve_booleans/source/blender/editors/interface/interface_draw.c
    branches/carve_booleans/source/blender/editors/interface/interface_widgets.c
    branches/carve_booleans/source/blender/editors/interface/view2d_ops.c
    branches/carve_booleans/source/blender/editors/object/object_edit.c
    branches/carve_booleans/source/blender/editors/object/object_intern.h
    branches/carve_booleans/source/blender/editors/object/object_ops.c
    branches/carve_booleans/source/blender/editors/object/object_select.c
    branches/carve_booleans/source/blender/editors/object/object_vgroup.c
    branches/carve_booleans/source/blender/editors/render/render_opengl.c
    branches/carve_booleans/source/blender/editors/screen/area.c
    branches/carve_booleans/source/blender/editors/sound/sound_ops.c
    branches/carve_booleans/source/blender/editors/space_clip/clip_draw.c
    branches/carve_booleans/source/blender/editors/space_clip/clip_intern.h
    branches/carve_booleans/source/blender/editors/space_clip/clip_ops.c
    branches/carve_booleans/source/blender/editors/space_clip/space_clip.c
    branches/carve_booleans/source/blender/editors/space_clip/tracking_ops.c
    branches/carve_booleans/source/blender/editors/space_graph/graph_edit.c
    branches/carve_booleans/source/blender/editors/space_node/drawnode.c
    branches/carve_booleans/source/blender/editors/space_node/node_draw.c
    branches/carve_booleans/source/blender/editors/space_node/node_edit.c
    branches/carve_booleans/source/blender/editors/space_node/node_intern.h
    branches/carve_booleans/source/blender/editors/space_view3d/drawmesh.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_draw.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_intern.h
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_ops.c
    branches/carve_booleans/source/blender/editors/space_view3d/view3d_select.c
    branches/carve_booleans/source/blender/imbuf/intern/divers.c
    branches/carve_booleans/source/blender/makesdna/DNA_node_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_object_force.h
    branches/carve_booleans/source/blender/makesdna/DNA_scene_types.h
    branches/carve_booleans/source/blender/makesdna/DNA_userdef_types.h
    branches/carve_booleans/source/blender/makesrna/RNA_access.h
    branches/carve_booleans/source/blender/makesrna/SConscript
    branches/carve_booleans/source/blender/makesrna/intern/CMakeLists.txt
    branches/carve_booleans/source/blender/makesrna/intern/SConscript
    branches/carve_booleans/source/blender/makesrna/intern/rna_nodetree.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/carve_booleans/source/blender/makesrna/intern/rna_tracking.c
    branches/carve_booleans/source/blender/makesrna/intern/rna_userdef.c
    branches/carve_booleans/source/blender/modifiers/intern/MOD_solidify.c
    branches/carve_booleans/source/blender/nodes/CMakeLists.txt
    branches/carve_booleans/source/blender/nodes/NOD_composite.h
    branches/carve_booleans/source/blender/nodes/NOD_shader.h
    branches/carve_booleans/source/blender/nodes/composite/node_composite_util.c
    branches/carve_booleans/source/blender/nodes/composite/node_composite_util.h
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/carve_booleans/source/blender/nodes/intern/node_common.c
    branches/carve_booleans/source/blender/nodes/shader/node_shader_util.c
    branches/carve_booleans/source/blender/python/SConscript
    branches/carve_booleans/source/blender/python/intern/CMakeLists.txt
    branches/carve_booleans/source/blender/python/intern/bpy_interface.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_event_system.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_init_exit.c
    branches/carve_booleans/source/blender/windowmanager/intern/wm_jobs.c
    branches/carve_booleans/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/carve_booleans/source/creator/CMakeLists.txt
    branches/carve_booleans/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/carve_booleans/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp

Added Paths:
-----------
    branches/carve_booleans/intern/cycles/blender/CCL_api.h
    branches/carve_booleans/intern/cycles/kernel/svm/svm_checker.h
    branches/carve_booleans/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/carve_booleans/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/carve_booleans/source/tests/bl_mesh_modifiers.py

Property Changed:
----------------
    branches/carve_booleans/
    branches/carve_booleans/source/blender/editors/space_outliner/


Property changes on: branches/carve_booleans
___________________________________________________________________
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:40001-42622,42663-43208
   + /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:40001-42622,42663-43279

Modified: branches/carve_booleans/build_files/cmake/RpmBuild.cmake
===================================================================
--- branches/carve_booleans/build_files/cmake/RpmBuild.cmake	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/build_files/cmake/RpmBuild.cmake	2012-01-11 07:19:32 UTC (rev 43280)
@@ -13,7 +13,7 @@
 
 	if(RPMBUILD)
 		message(STATUS "RPM Build Found: ${RPMBUILD}")
-	else(RPMBUILD) 
+	else() 
 		message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
 	endif()
 
@@ -21,6 +21,6 @@
 
 if(RPMBUILD)
 	set(RPMBUILD_FOUND TRUE)
-else(RPMBUILD) 
+else() 
 	set(RPMBUILD_FOUND FALSE)
 endif()
\ No newline at end of file

Modified: branches/carve_booleans/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/carve_booleans/build_files/scons/config/freebsd7-config.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/build_files/scons/config/freebsd7-config.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -117,7 +117,7 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True  # -DWITH_OGG 
+WITH_BF_OGG = True
 BF_OGG = '/usr/local'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/carve_booleans/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/carve_booleans/build_files/scons/config/freebsd8-config.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/build_files/scons/config/freebsd8-config.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -117,7 +117,7 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True  # -DWITH_OGG 
+WITH_BF_OGG = True
 BF_OGG = '/usr/local'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/carve_booleans/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/carve_booleans/build_files/scons/config/freebsd9-config.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/build_files/scons/config/freebsd9-config.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -117,7 +117,7 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True  # -DWITH_OGG 
+WITH_BF_OGG = True
 BF_OGG = '/usr/local'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/carve_booleans/build_files/scons/config/linux-config.py
===================================================================
--- branches/carve_booleans/build_files/scons/config/linux-config.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/build_files/scons/config/linux-config.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -140,7 +140,7 @@
 #BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = False  # -DWITH_OGG 
+WITH_BF_OGG = False
 BF_OGG = '/usr'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/carve_booleans/build_files/scons/tools/btools.py
===================================================================
--- branches/carve_booleans/build_files/scons/tools/btools.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/build_files/scons/tools/btools.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -323,7 +323,7 @@
         (BoolVariable('WITH_BF_STATICFFMPEG', 'Use static FFMPEG if true', False)),
         ('BF_FFMPEG_LIB_STATIC', 'Static FFMPEG libraries', ''),
         
-        (BoolVariable('WITH_BF_OGG', 'Use OGG, THEORA, VORBIS in FFMPEG if true',
+        (BoolVariable('WITH_BF_OGG', 'Link OGG, THEORA, VORBIS with FFMPEG if true',
                     False)),
         ('BF_OGG', 'OGG base path', ''),
         ('BF_OGG_LIB', 'OGG library', ''),

Modified: branches/carve_booleans/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/carve_booleans/intern/cycles/app/cycles_xml.cpp	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/intern/cycles/app/cycles_xml.cpp	2012-01-11 07:19:32 UTC (rev 43280)
@@ -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/carve_booleans/intern/cycles/blender/CCL_api.h (from rev 43279, trunk/blender/intern/cycles/blender/CCL_api.h)
===================================================================
--- branches/carve_booleans/intern/cycles/blender/CCL_api.h	                        (rev 0)
+++ branches/carve_booleans/intern/cycles/blender/CCL_api.h	2012-01-11 07:19:32 UTC (rev 43280)
@@ -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/carve_booleans/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/carve_booleans/intern/cycles/blender/CMakeLists.txt	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/intern/cycles/blender/CMakeLists.txt	2012-01-11 07:19:32 UTC (rev 43280)
@@ -27,6 +27,7 @@
 	blender_shader.cpp
 	blender_sync.cpp
 
+	CCL_api.h
 	blender_sync.h
 	blender_session.h
 	blender_util.h

Modified: branches/carve_booleans/intern/cycles/blender/addon/engine.py
===================================================================
--- branches/carve_booleans/intern/cycles/blender/addon/engine.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/intern/cycles/blender/addon/engine.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -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/carve_booleans/intern/cycles/blender/addon/enums.py
===================================================================
--- branches/carve_booleans/intern/cycles/blender/addon/enums.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/intern/cycles/blender/addon/enums.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -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/carve_booleans/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/carve_booleans/intern/cycles/blender/addon/properties.py	2012-01-11 07:03:47 UTC (rev 43279)
+++ branches/carve_booleans/intern/cycles/blender/addon/properties.py	2012-01-11 07:19:32 UTC (rev 43280)
@@ -38,9 +38,6 @@
         cls.device = EnumProperty(name="Device", description="Device to use for rendering",

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list