Revision: 42468
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42468
Author: campbellbarton
Date: 2011-12-06 18:50:45 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42439:42466
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42439
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
branches/bmesh/blender/intern/cycles/kernel/SConscript
branches/bmesh/blender/intern/cycles/util/util_md5.cpp
branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_graph_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/extern/libmv/third_party/glog/src/config_freebsd.h
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379
/trunk/blender:39992-42439
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379
/trunk/blender:39992-42466
Modified: branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
2011-12-06 18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
2011-12-06 18:50:45 UTC (rev 42468)
@@ -47,6 +47,13 @@
import sys
+def quote_define(define):
+ if " " in define.strip():
+ return '"%s"' % define
+ else:
+ return define
+
+
def create_qtc_project_main():
files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
@@ -99,7 +106,7 @@
qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
- defines_final = [("#define %s %s" % item) for item in defines]
+ defines_final = [("#define %s %s" % (item[0], quote_define(item[1])))
for item in defines]
if sys.platform != "win32":
defines_final += cmake_compiler_defines()
f.write("\n".join(defines_final))
Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-12-06
18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-12-06
18:50:45 UTC (rev 42468)
@@ -157,7 +157,7 @@
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC',
'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB',
'BF_JEMALLOC_LIB_STATIC',
'BUILDBOT_BRANCH',
'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE',
'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH',
'BF_3DMOUSE_LIB_STATIC',
- 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES'
'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC',
+ 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES'
'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC',
'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC',
'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST',
'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH'
]
@@ -545,6 +545,7 @@
localopts.AddVariables(
(BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
(BoolVariable('WITH_BF_CYCLES_CUDA_BINARIES', 'Build with precompiled
CUDA binaries', False)),
+ (BoolVariable('WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'Build several
render kernels at once (using BF_NUMJOBS)', False)),
('BF_CYCLES_CUDA_NVCC', 'CUDA nvcc compiler path', ''),
('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile
binaries for', []),
Property changes on:
branches/bmesh/blender/extern/libmv/third_party/glog/src/config_freebsd.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-12-06
18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2011-12-06
18:50:45 UTC (rev 42468)
@@ -725,6 +725,7 @@
if experimental and cscene.device == 'CPU' and engine.with_osl():
layout.prop(cscene, "shading_system")
+
def draw_pause(self, context):
layout = self.layout
scene = context.scene
Modified: branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
2011-12-06 18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
2011-12-06 18:50:45 UTC (rev 42468)
@@ -264,7 +264,12 @@
if(RNA_enum_get(&cscene, "device") != 0) {
vector<DeviceType> types = Device::available_types();
- DeviceType dtype = (RNA_enum_get(&cscene, "gpu_type") == 0)?
DEVICE_CUDA: DEVICE_OPENCL;
+ DeviceType dtype;
+
+ if(!experimental || RNA_enum_get(&cscene, "gpu_type") == 0)
+ dtype = DEVICE_CUDA;
+ else
+ dtype = DEVICE_CUDA;
if(device_type_available(types, dtype))
params.device_type = dtype;
Modified: branches/bmesh/blender/intern/cycles/kernel/SConscript
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/SConscript 2011-12-06
18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/intern/cycles/kernel/SConscript 2011-12-06
18:50:45 UTC (rev 42468)
@@ -34,6 +34,7 @@
# dependencies
dependencies = ['kernel.cu'] + kernel.Glob('*.h') +
kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h')
+ last_cubin_file = None
# add command for each cuda architecture
for arch in cuda_archs:
@@ -45,6 +46,12 @@
kernel.Depends(cubin_file, dependencies)
kernel_binaries.append(cubin_file)
+
+ if not env['WITH_BF_CYCLES_CUDA_THREADED_COMPILE']:
+ # trick to compile one kernel at a time to reduce memory usage
+ if last_cubin_file:
+ kernel.Depends(cubin_file, last_cubin_file)
+ last_cubin_file = cubin_file
Return('kernel_binaries')
Modified: branches/bmesh/blender/intern/cycles/util/util_md5.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/util/util_md5.cpp 2011-12-06
18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/intern/cycles/util/util_md5.cpp 2011-12-06
18:50:45 UTC (rev 42468)
@@ -361,14 +361,15 @@
string MD5Hash::get_hex()
{
uint8_t digest[16];
- char buf[16*2];
+ char buf[16*2+1];
finish(digest);
for(int i=0; i<16; i++)
sprintf(buf + i*2, "%02X", digest[i]);
+ buf[sizeof(buf)-1] = '\0';
- return string(buf, sizeof(buf));
+ return string(buf);
}
CCL_NAMESPACE_END
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42439
+ /trunk/blender/release:31524-42466
Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
2011-12-06 18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
2011-12-06 18:50:45 UTC (rev 42468)
@@ -269,8 +269,6 @@
return axis_forward, axis_up
- change = False
-
axis = getattr(operator, forward_attr), getattr(operator, up_attr)
axis_new = validate(*axis)
Modified:
branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
===================================================================
---
branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
2011-12-06 18:39:16 UTC (rev 42467)
+++
branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
2011-12-06 18:50:45 UTC (rev 42468)
@@ -62,7 +62,9 @@
else:
org_sca_x, org_sca_y, org_sca_z = obj.scale
- sca_x, sca_y, sca_z = uniform(-scale[0]+2, scale[0]),
uniform(-scale[1]+2, scale[1]), uniform(-scale[2]+2, scale[2])
+ sca_x, sca_y, sca_z = (uniform(-scale[0] + 2.0, scale[0]),
+ uniform(-scale[1] + 2.0, scale[1]),
+ uniform(-scale[2] + 2.0, scale[2]))
if scale_even:
aX = sca_x * org_sca_x
@@ -81,7 +83,9 @@
uniform(0.0, 0.0), uniform(0.0, 0.0), uniform(0.0, 0.0)
-from bpy.props import IntProperty, BoolProperty, FloatProperty,
FloatVectorProperty
+from bpy.props import (IntProperty,
+ BoolProperty,
+ FloatVectorProperty)
class RandomizeLocRotSize(Operator):
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
2011-12-06 18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
2011-12-06 18:50:45 UTC (rev 42468)
@@ -453,7 +453,7 @@
rd = context.scene.render
image_settings = rd.image_settings
- file_format = rd.image_settings.file_format
+ file_format = image_settings.file_format
layout.prop(rd, "filepath", text="")
@@ -462,7 +462,7 @@
flow.prop(rd, "use_placeholder")
flow.prop(rd, "use_file_extension")
- layout.template_image_settings(rd.image_settings)
+ layout.template_image_settings(image_settings)
if file_format == 'QUICKTIME_CARBON':
layout.operator("scene.render_data_set_quicktime_codec")
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
2011-12-06 18:39:16 UTC (rev 42467)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
2011-12-06 18:50:45 UTC (rev 42468)
@@ -166,7 +166,7 @@
layout.template_preview(tex, parent=idblock, slot=slot)
else:
layout.template_preview(tex, slot=slot)
-
+
#Show Alpha Button for Brush Textures, see #29502
if context.space_data.texture_context == 'BRUSH':
layout.prop(tex, "use_preview_alpha")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
