[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59088] branches/soc-2011-tomato: Merging r59029 through r59087 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Aug 12 16:42:49 CEST 2013
Revision: 59088
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59088
Author: nazgul
Date: 2013-08-12 14:42:49 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
Merging r59029 through r59087 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59029
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59087
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
branches/soc-2011-tomato/intern/cycles/device/device_task.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cl
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cu
branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_curve.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_wave.h
branches/soc-2011-tomato/intern/cycles/render/curves.cpp
branches/soc-2011-tomato/intern/cycles/render/session.cpp
branches/soc-2011-tomato/intern/cycles/render/tile.cpp
branches/soc-2011-tomato/release/scripts/modules/bpy/path.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_screen.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/screen.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_edit.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_time/space_time.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-tomato/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
branches/soc-2011-tomato/source/blender/gpu/GPU_buffers.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_image_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2011-tomato/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2011-tomato/release/text/GPL3-license.txt
branches/soc-2011-tomato/release/text/jemalloc-license.txt
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-59028
+ /branches/ge_dev:58091-58422
/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-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-59087
Modified: branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-08-12 14:42:49 UTC (rev 59088)
@@ -237,6 +237,7 @@
# Version??
OPENCOLLADA_VERSION="1.3"
OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
+OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false
@@ -1632,7 +1633,7 @@
compile_OpenCOLLADA() {
# To be changed each time we make edits that would modify the compiled results!
- opencollada_magic=6
+ opencollada_magic=7
_init_opencollada
# Clean install if needed!
@@ -1657,7 +1658,7 @@
git pull origin master
# Stick to same rev as windows' libs...
- git checkout e886e196673222f2f4bc32b936dc96419fff815f
+ git checkout $OPENCOLLADA_REPO_UID
git reset --hard
# Always refresh the whole build!
Modified: branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-12 14:42:49 UTC (rev 59088)
@@ -52,6 +52,7 @@
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -59,7 +60,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2013-08-12 14:42:49 UTC (rev 59088)
@@ -67,9 +67,7 @@
row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
row = layout.row()
- sub = row.row()
- sub.active = (device_type == 'NONE' or cscene.device == 'CPU')
- sub.prop(cscene, "progressive")
+ row.prop(cscene, "progressive")
if not cscene.progressive:
row.prop(cscene, "squared_samples")
@@ -82,7 +80,7 @@
sub.prop(cscene, "seed")
sub.prop(cscene, "sample_clamp")
- if cscene.progressive or (device_type != 'NONE' and cscene.device == 'GPU'):
+ if cscene.progressive:
col = split.column()
sub = col.column(align=True)
sub.label(text="Samples:")
@@ -355,7 +353,9 @@
col.prop(rl, "use_pass_uv")
col.prop(rl, "use_pass_object_index")
col.prop(rl, "use_pass_material_index")
+ col.separator()
col.prop(rl, "use_pass_shadow")
+ col.prop(rl, "use_pass_ambient_occlusion")
col = split.column()
col.label(text="Diffuse:")
@@ -382,7 +382,6 @@
col.separator()
col.prop(rl, "use_pass_emit", text="Emission")
col.prop(rl, "use_pass_environment")
- col.prop(rl, "use_pass_ambient_occlusion")
class Cycles_PT_post_processing(CyclesButtonsPanel, Panel):
@@ -656,7 +655,6 @@
lamp = context.lamp
clamp = lamp.cycles
cscene = context.scene.cycles
- device_type = context.user_preferences.system.compute_device_type
layout.prop(lamp, "type", expand=True)
@@ -675,7 +673,7 @@
sub.prop(lamp, "size", text="Size X")
sub.prop(lamp, "size_y", text="Size Y")
- if not cscene.progressive and (device_type == 'NONE' or cscene.device == 'CPU'):
+ if not cscene.progressive:
col.prop(clamp, "samples")
col = split.column()
@@ -864,7 +862,6 @@
world = context.world
cworld = world.cycles
cscene = context.scene.cycles
- device_type = context.user_preferences.system.compute_device_type
col = layout.column()
@@ -872,7 +869,7 @@
sub = col.row(align=True)
sub.active = cworld.sample_as_light
sub.prop(cworld, "sample_map_resolution")
- if not cscene.progressive and (device_type == 'NONE' or cscene.device == 'CPU'):
+ if not cscene.progressive:
sub.prop(cworld, "samples")
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp 2013-08-12 14:42:49 UTC (rev 59088)
@@ -373,7 +373,7 @@
if(show_emitter) {
hide_triangles = false;
- return (hide_as_dupli_parent || hide_as_dupli_child_original);
+ return false;
}
else if(hair_present) {
hide_triangles = true;
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp 2013-08-12 14:42:49 UTC (rev 59088)
@@ -420,7 +420,7 @@
preview_aa_samples = preview_aa_samples * preview_aa_samples;
}
- if(get_boolean(cscene, "progressive") == 0 && params.device.type == DEVICE_CPU) {
+ if(get_boolean(cscene, "progressive") == 0) {
if(background) {
params.samples = aa_samples;
}
Modified: branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp 2013-08-12 14:42:49 UTC (rev 59088)
@@ -558,7 +558,7 @@
}
}
- void path_trace(RenderTile& rtile, int sample)
+ void path_trace(RenderTile& rtile, int sample, bool progressive)
{
if(have_error())
return;
@@ -570,7 +570,13 @@
CUdeviceptr d_rng_state = cuda_device_ptr(rtile.rng_state);
/* get kernel function */
- cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace"))
+ if(progressive)
+ cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_progressive"))
+ else {
+ cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_path_trace_non_progressive"))
+ if(have_error())
+ return;
+ }
/* pass in parameters */
int offset = 0;
@@ -914,6 +920,8 @@
if(task->type == DeviceTask::PATH_TRACE) {
RenderTile tile;
+ bool progressive = task->integrator_progressive;
+
/* keep rendering tiles until done */
while(task->acquire_tile(this, tile)) {
int start_sample = tile.start_sample;
@@ -925,7 +933,7 @@
break;
}
- path_trace(tile, sample);
+ path_trace(tile, sample, progressive);
tile.sample = sample + 1;
Modified: branches/soc-2011-tomato/intern/cycles/device/device_task.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/device/device_task.h 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/intern/cycles/device/device_task.h 2013-08-12 14:42:49 UTC (rev 59088)
@@ -65,6 +65,7 @@
boost::function<bool(void)> get_cancel;
bool need_finish_queue;
+ bool integrator_progressive;
protected:
double last_update_time;
};
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel.cl
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel.cl 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel.cl 2013-08-12 14:42:49 UTC (rev 59088)
@@ -51,7 +51,7 @@
int y = sy + get_global_id(1);
if(x < sx + sw && y < sy + sh)
- kernel_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride);
+ kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride);
}
__kernel void kernel_ocl_tonemap(
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp 2013-08-12 14:37:23 UTC (rev 59087)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp 2013-08-12 14:42:49 UTC (rev 59088)
@@ -90,7 +90,12 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list