[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58451] branches/soc-2013-dingto: Merged revision(s) 58424-58448 from trunk/blender into soc-2013-dingto
Thomas Dinges
blender at dingto.org
Sat Jul 20 17:46:50 CEST 2013
Revision: 58451
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58451
Author: dingto
Date: 2013-07-20 15:46:49 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
Merged revision(s) 58424-58448 from trunk/blender into soc-2013-dingto
Had to resolve manual conflict in addon/ui.py and blender/blender_sync.cpp due to Non-Progressive integrator, which is enabled in my branch.
Modified Paths:
--------------
branches/soc-2013-dingto/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2013-dingto/intern/cycles/blender/addon/presets.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_object.cpp
branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-dingto/intern/cycles/device/device_cpu.cpp
branches/soc-2013-dingto/intern/cycles/render/session.cpp
branches/soc-2013-dingto/intern/cycles/util/util_task.cpp
branches/soc-2013-dingto/intern/cycles/util/util_task.h
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_edit.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_intern.h
branches/soc-2013-dingto/source/blender/editors/mask/mask_select.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/util/CMakeLists.txt
branches/soc-2013-dingto/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-dingto/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-dingto/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/common/SConscript
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_FontObject.h
Added Paths:
-----------
branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/
Property Changed:
----------------
branches/soc-2013-dingto/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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-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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58423
+ /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-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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448
Modified: branches/soc-2013-dingto/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/soc-2013-dingto/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2013-07-20 15:43:48 UTC (rev 58450)
+++ branches/soc-2013-dingto/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2013-07-20 15:46:49 UTC (rev 58451)
@@ -347,10 +347,6 @@
uint64_t st_time = m_formatCtx->start_time;
uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate);
- if (seek_pos < 0) {
- seek_pos = 0;
- }
-
if (st_time != AV_NOPTS_VALUE) {
seek_pos += st_time;
}
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/presets.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/presets.py 2013-07-20 15:43:48 UTC (rev 58450)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/presets.py 2013-07-20 15:46:49 UTC (rev 58451)
@@ -46,6 +46,36 @@
preset_subdir = "cycles/integrator"
+class AddPresetSampling(AddPresetBase, Operator):
+ '''Add a Sampling Preset'''
+ bl_idname = "render.cycles_sampling_preset_add"
+ bl_label = "Add Sampling Preset"
+ preset_menu = "CYCLES_MT_sampling_presets"
+
+ preset_defines = [
+ "cycles = bpy.context.scene.cycles"
+ ]
+
+ preset_values = [
+ "cycles.samples",
+ "cycles.preview_samples",
+ "cycles.aa_samples",
+ "cycles.preview_aa_samples",
+ "cycles.diffuse_samples",
+ "cycles.glossy_samples",
+ "cycles.transmission_samples",
+ "cycles.ao_samples",
+ "cycles.mesh_light_samples",
+ "cycles.subsurface_samples",
+ "cycles.no_caustics",
+ "cycles.blur_glossy",
+ "cycles.squared_samples",
+ "cycles.progressive"
+ ]
+
+ preset_subdir = "cycles/sampling"
+
+
def register():
pass
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py 2013-07-20 15:43:48 UTC (rev 58450)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/properties.py 2013-07-20 15:46:49 UTC (rev 58451)
@@ -150,6 +150,11 @@
description="Use progressive sampling of lighting",
default=True,
)
+ cls.squared_samples = BoolProperty(
+ name="Squared Samples",
+ description="Square sampling values for easier artist control",
+ default=False,
+ )
cls.samples = IntProperty(
name="Samples",
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-07-20 15:43:48 UTC (rev 58450)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-07-20 15:46:49 UTC (rev 58451)
@@ -23,6 +23,14 @@
from bpy.types import Panel, Menu, Operator
+class CYCLES_MT_sampling_presets(Menu):
+ bl_label = "Sampling Presets"
+ preset_subdir = "cycles/sampling"
+ preset_operator = "script.execute_preset"
+ COMPAT_ENGINES = {'CYCLES'}
+ draw = Menu.draw_preset
+
+
class CYCLES_MT_integrator_presets(Menu):
bl_label = "Integrator Presets"
preset_subdir = "cycles/integrator"
@@ -52,20 +60,28 @@
scene = context.scene
cscene = scene.cycles
device_type = context.user_preferences.system.compute_device_type
+
+ row = layout.row(align=True)
+ row.menu("CYCLES_MT_sampling_presets", text=bpy.types.CYCLES_MT_sampling_presets.bl_label)
+ row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMIN")
+ row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
+ row = layout.row()
+ row.prop(cscene, "progressive")
+ row.prop(cscene, "squared_samples")
+
split = layout.split()
-
+
col = split.column()
- col.prop(cscene, "progressive")
-
sub = col.column(align=True)
+ sub.label("Settings:")
sub.prop(cscene, "seed")
sub.prop(cscene, "sample_clamp")
if cscene.progressive:
col = split.column()
- col.label(text="Samples:")
sub = col.column(align=True)
+ sub.label(text="Samples:")
sub.prop(cscene, "samples", text="Render")
sub.prop(cscene, "preview_samples", text="Preview")
else:
@@ -74,8 +90,8 @@
sub.prop(cscene, "preview_aa_samples", text="Preview")
col = split.column()
- col.label(text="Samples:")
sub = col.column(align=True)
+ sub.label(text="Samples:")
sub.prop(cscene, "diffuse_samples", text="Diffuse")
sub.prop(cscene, "glossy_samples", text="Glossy")
sub.prop(cscene, "transmission_samples", text="Transmission")
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp 2013-07-20 15:43:48 UTC (rev 58450)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_object.cpp 2013-07-20 15:46:49 UTC (rev 58451)
@@ -154,10 +154,16 @@
light->shader = used_shaders[0];
/* shadow */
+ PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
PointerRNA clamp = RNA_pointer_get(&b_lamp.ptr, "cycles");
light->cast_shadow = get_boolean(clamp, "cast_shadow");
light->use_mis = get_boolean(clamp, "use_multiple_importance_sampling");
- light->samples = get_int(clamp, "samples");
+
+ int samples = get_int(clamp, "samples");
+ if(get_boolean(cscene, "squared_samples"))
+ light->samples = samples * samples;
+ else
+ light->samples = samples;
/* visibility */
uint visibility = object_ray_visibility(b_ob);
@@ -174,6 +180,7 @@
BL::World b_world = b_scene.world();
if(b_world) {
+ PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
PointerRNA cworld = RNA_pointer_get(&b_world.ptr, "cycles");
bool sample_as_light = get_boolean(cworld, "sample_as_light");
@@ -188,8 +195,13 @@
{
light->type = LIGHT_BACKGROUND;
light->map_resolution = get_int(cworld, "sample_map_resolution");
- light->samples = get_int(cworld, "samples");
light->shader = scene->default_background;
+
+ int samples = get_int(cworld, "samples");
+ if(get_boolean(cscene, "squared_samples"))
+ light->samples = samples * samples;
+ else
+ light->samples = samples;
light->tag_update(scene);
light_map.set_recalc(b_world);
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp 2013-07-20 15:43:48 UTC (rev 58450)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp 2013-07-20 15:46:49 UTC (rev 58451)
@@ -191,14 +191,33 @@
}
#endif
- integrator->diffuse_samples = get_int(cscene, "diffuse_samples");
- integrator->glossy_samples = get_int(cscene, "glossy_samples");
- integrator->transmission_samples = get_int(cscene, "transmission_samples");
- integrator->ao_samples = get_int(cscene, "ao_samples");
- integrator->mesh_light_samples = get_int(cscene, "mesh_light_samples");
- integrator->subsurface_samples = get_int(cscene, "subsurface_samples");
integrator->progressive = get_boolean(cscene, "progressive");
+ int diffuse_samples = get_int(cscene, "diffuse_samples");
+ int glossy_samples = get_int(cscene, "glossy_samples");
+ int transmission_samples = get_int(cscene, "transmission_samples");
+ int ao_samples = get_int(cscene, "ao_samples");
+ int mesh_light_samples = get_int(cscene, "mesh_light_samples");
+ int subsurface_samples = get_int(cscene, "subsurface_samples");
+
+ if(get_boolean(cscene, "squared_samples")) {
+ integrator->diffuse_samples = diffuse_samples * diffuse_samples;
+ integrator->glossy_samples = glossy_samples * glossy_samples;
+ integrator->transmission_samples = transmission_samples * transmission_samples;
+ integrator->ao_samples = ao_samples * ao_samples;
+ integrator->mesh_light_samples = mesh_light_samples * mesh_light_samples;
+ integrator->subsurface_samples = subsurface_samples * subsurface_samples;
+ }
+ else {
+ integrator->diffuse_samples = diffuse_samples;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list