[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59410] branches/soc-2013-paint: Merge trunk -r59408 into soc-2013-paint
Antony Riakiotakis
kalast at gmail.com
Fri Aug 23 12:18:15 CEST 2013
Revision: 59410
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59410
Author: psy-fi
Date: 2013-08-23 10:18:15 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Merge trunk -r59408 into soc-2013-paint
Conflicts:
source/blender/editors/sculpt_paint/paint_stroke.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59408
Modified Paths:
--------------
branches/soc-2013-paint/build_files/build_environment/install_deps.sh
branches/soc-2013-paint/build_files/cmake/macros.cmake
branches/soc-2013-paint/intern/atomic/atomic_ops.h
branches/soc-2013-paint/intern/cycles/blender/addon/presets.py
branches/soc-2013-paint/intern/cycles/blender/addon/properties.py
branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
branches/soc-2013-paint/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_object.cpp
branches/soc-2013-paint/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh_subsurface.h
branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-paint/intern/cycles/render/curves.h
branches/soc-2013-paint/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2013-paint/release/datafiles/prvicons.png
branches/soc-2013-paint/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-paint/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-paint/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-paint/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_displist.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-paint/source/blender/blenkernel/intern/anim.c
branches/soc-2013-paint/source/blender/blenkernel/intern/brush.c
branches/soc-2013-paint/source/blender/blenkernel/intern/curve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/displist.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/object.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-paint/source/blender/blenkernel/intern/sound.c
branches/soc-2013-paint/source/blender/blenlib/BLI_fileops.h
branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-paint/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-paint/source/blender/blenlib/BLI_sort.h
branches/soc-2013-paint/source/blender/blenlib/BLI_winstuff.h
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-paint/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-paint/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-paint/source/blender/blenlib/intern/sort.c
branches/soc-2013-paint/source/blender/blenlib/intern/storage.c
branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
branches/soc-2013-paint/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-paint/source/blender/bmesh/bmesh.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_split_edges.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_unsubdivide.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-paint/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2013-paint/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-paint/source/blender/editors/interface/interface_templates.c
branches/soc-2013-paint/source/blender/editors/mask/mask_edit.c
branches/soc-2013-paint/source/blender/editors/mask/mask_intern.h
branches/soc-2013-paint/source/blender/editors/mask/mask_ops.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_path.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-paint/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-paint/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-paint/source/blender/editors/object/object_edit.c
branches/soc-2013-paint/source/blender/editors/object/object_vgroup.c
branches/soc-2013-paint/source/blender/editors/render/render_internal.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-paint/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2013-paint/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-paint/source/blender/editors/space_image/image_ops.c
branches/soc-2013-paint/source/blender/editors/space_image/space_image.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-paint/source/blender/editors/transform/transform.c
branches/soc-2013-paint/source/blender/editors/transform/transform.h
branches/soc-2013-paint/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-paint/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-paint/source/blender/editors/transform/transform_generics.c
branches/soc-2013-paint/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-paint/source/blender/imbuf/intern/imageprocess.c
branches/soc-2013-paint/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2013-paint/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-paint/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2013-paint/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-paint/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2013-paint/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-paint/source/gameengine/Ketsji/KX_RaySensor.h
Added Paths:
-----------
branches/soc-2013-paint/source/blender/bmesh/bmesh_tools.h
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bisect_plane.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bisect_plane.h
Modified: branches/soc-2013-paint/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-paint/build_files/build_environment/install_deps.sh 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/build_files/build_environment/install_deps.sh 2013-08-23 10:18:15 UTC (rev 59410)
@@ -212,6 +212,7 @@
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
+_need_openexr_ldconfig=false
OIIO_VERSION="1.1.10"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
@@ -230,6 +231,7 @@
# OSL needs to be compiled for now!
OSL_VERSION="1.3.2"
+OSL_VERSION_MIN=$OSL_VERSION
OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -2776,7 +2778,7 @@
if [ $? -eq 0 ]; then
install_packages_ARCH llvm clang
have_llvm=true
- LLVM_VERSION=`check_package_version_ge_ARCH llvm`
+ LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
Modified: branches/soc-2013-paint/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/build_files/cmake/macros.cmake 2013-08-23 10:18:15 UTC (rev 59410)
@@ -799,4 +799,35 @@
unset(_file_from)
unset(_file_to)
unset(_file_to_path)
+
endmacro()
+
+macro(svg_to_png
+ file_from
+ file_to
+ dpi
+ list_to_add)
+
+ # remove ../'s
+ get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
+ get_filename_component(_file_to ${CMAKE_CURRENT_SOURCE_DIR}/${file_to} REALPATH)
+
+ list(APPEND ${list_to_add} ${_file_to})
+
+ find_program(INKSCAPE_EXE inkscape)
+ mark_as_advanced(INKSCAPE_EXE)
+
+ if(INKSCAPE_EXE)
+ add_custom_command(
+ OUTPUT ${_file_to}
+ COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
+ DEPENDS ${_file_from} ${INKSCAPE_EXE}
+ )
+ else()
+ message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!")
+ endif()
+
+ unset(_file_from)
+ unset(_file_to)
+
+endmacro()
\ No newline at end of file
Modified: branches/soc-2013-paint/intern/atomic/atomic_ops.h
===================================================================
--- branches/soc-2013-paint/intern/atomic/atomic_ops.h 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/intern/atomic/atomic_ops.h 2013-08-23 10:18:15 UTC (rev 59410)
@@ -26,8 +26,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ATOMIC_OPS_H__
-#define ATOMIC_OPS_H__
+#ifndef __ATOMIC_OPS_H__
+#define __ATOMIC_OPS_H__
#include <assert.h>
@@ -304,4 +304,4 @@
#endif
}
-#endif /* ATOMIC_OPS_H__ */
+#endif /* __ATOMIC_OPS_H__ */
Modified: branches/soc-2013-paint/intern/cycles/blender/addon/presets.py
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/addon/presets.py 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/intern/cycles/blender/addon/presets.py 2013-08-23 10:18:15 UTC (rev 59410)
@@ -67,7 +67,7 @@
"cycles.subsurface_samples",
"cycles.no_caustics",
"cycles.blur_glossy",
- "cycles.squared_samples",
+ "cycles.use_square_samples",
"cycles.progressive"
]
Modified: branches/soc-2013-paint/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/addon/properties.py 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/intern/cycles/blender/addon/properties.py 2013-08-23 10:18:15 UTC (rev 59410)
@@ -128,8 +128,8 @@
description="Use progressive sampling of lighting",
default=True,
)
- cls.squared_samples = BoolProperty(
- name="Squared Samples",
+ cls.use_square_samples = BoolProperty(
+ name="Square Samples",
description="Square sampling values for easier artist control",
default=False,
)
Modified: branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/addon/ui.py 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/intern/cycles/blender/addon/ui.py 2013-08-23 10:18:15 UTC (rev 59410)
@@ -48,6 +48,45 @@
return rd.engine == 'CYCLES'
+def draw_samples_info(layout, cscene):
+ # Calculate sample values
+ if cscene.progressive:
+ aa = cscene.samples
+ if cscene.use_square_samples:
+ aa = aa * aa
+ else:
+ aa = cscene.aa_samples
+ d = cscene.diffuse_samples
+ g = cscene.glossy_samples
+ t = cscene.transmission_samples
+ ao = cscene.ao_samples
+ ml = cscene.mesh_light_samples
+ sss = cscene.subsurface_samples
+
+ if cscene.use_square_samples:
+ aa = aa * aa
+ d = d * d
+ g = g * g
+ t = t * t
+ ao = ao * ao
+ ml = ml * ml
+ sss = sss * sss
+
+ # Draw interface
+ col = layout.column(align=True)
+ col.scale_y = 0.6
+ col.label("Total Samples:")
+ col.separator()
+ if cscene.progressive:
+ col.label("%s AA" % aa)
+ else:
+ col.label("%s AA, %s Diffuse, %s Glossy, %s Transmission" %
+ (aa, d * aa, g * aa, t * aa))
+ col.separator()
+ col.label("%s AO, %s Mesh Light, %s Subsurface" %
+ (ao * aa, ml * aa, sss * aa))
+
+
class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
bl_label = "Sampling"
bl_options = {'DEFAULT_CLOSED'}
@@ -58,7 +97,7 @@
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")
@@ -66,12 +105,10 @@
row = layout.row()
row.prop(cscene, "progressive")
-
- if not cscene.progressive:
- row.prop(cscene, "squared_samples")
-
+ row.prop(cscene, "use_square_samples")
+
split = layout.split()
-
+
col = split.column()
sub = col.column(align=True)
sub.label("Settings:")
@@ -108,7 +145,9 @@
layout.row().prop(cscene, "use_layer_samples")
break
+ draw_samples_info(layout, cscene)
+
class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
bl_label = "Light Paths"
bl_options = {'DEFAULT_CLOSED'}
@@ -242,7 +281,7 @@
col.separator()
- col.label(text="Acceleration structure:")
+ col.label(text="Acceleration structure:")
col.prop(cscene, "debug_use_spatial_splits")
@@ -376,7 +415,7 @@
row.prop(rl, "use_pass_subsurface_direct", text="Direct", toggle=True)
row.prop(rl, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
row.prop(rl, "use_pass_subsurface_color", text="Color", toggle=True)
-
+
col.separator()
col.prop(rl, "use_pass_emit", text="Emission")
col.prop(rl, "use_pass_environment")
@@ -551,7 +590,8 @@
@classmethod
def poll(cls, context):
ob = context.object
- return CyclesButtonsPanel.poll(context) and ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'LAMP'}
+ return (CyclesButtonsPanel.poll(context) and
+ ob and ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'LAMP'})
def draw(self, context):
layout = self.layout
Modified: branches/soc-2013-paint/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/blender_curves.cpp 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/intern/cycles/blender/blender_curves.cpp 2013-08-23 10:18:15 UTC (rev 59410)
@@ -711,8 +711,6 @@
void BlenderSync::sync_curve_settings()
{
PointerRNA csscene = RNA_pointer_get(&b_scene.ptr, "cycles_curves");
-
- int preset = CURVE_ACCURATE_PRESET;
CurveSystemManager *curve_system_manager = scene->curve_system_manager;
CurveSystemManager prev_curve_system_manager = *curve_system_manager;
Modified: branches/soc-2013-paint/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/blender_object.cpp 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/intern/cycles/blender/blender_object.cpp 2013-08-23 10:18:15 UTC (rev 59410)
@@ -158,7 +158,7 @@
light->use_mis = get_boolean(clamp, "use_multiple_importance_sampling");
int samples = get_int(clamp, "samples");
- if(get_boolean(cscene, "squared_samples"))
+ if(get_boolean(cscene, "use_square_samples"))
light->samples = samples * samples;
else
light->samples = samples;
@@ -196,7 +196,7 @@
light->shader = scene->default_background;
int samples = get_int(cworld, "samples");
- if(get_boolean(cscene, "squared_samples"))
+ if(get_boolean(cscene, "use_square_samples"))
light->samples = samples * samples;
else
light->samples = samples;
Modified: branches/soc-2013-paint/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/blender_sync.cpp 2013-08-23 10:12:09 UTC (rev 59409)
+++ branches/soc-2013-paint/intern/cycles/blender/blender_sync.cpp 2013-08-23 10:18:15 UTC (rev 59410)
@@ -198,7 +198,7 @@
int mesh_light_samples = get_int(cscene, "mesh_light_samples");
int subsurface_samples = get_int(cscene, "subsurface_samples");
- if(get_boolean(cscene, "squared_samples")) {
+ if(get_boolean(cscene, "use_square_samples")) {
integrator->diffuse_samples = diffuse_samples * diffuse_samples;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list