[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42051] branches/soc-2011-onion-uv-tools: merge with trunk 42050
Antony Riakiotakis
kalast at gmail.com
Tue Nov 22 02:34:55 CET 2011
Revision: 42051
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42051
Author: psy-fi
Date: 2011-11-22 01:34:54 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
merge with trunk 42050
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/__init__.py
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_bvh.h
branches/soc-2011-onion-uv-tools/intern/cycles/util/util_math.h
branches/soc-2011-onion-uv-tools/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-onion-uv-tools/release/scripts/modules/addon_utils.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_image.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeavi.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bmfont.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_interface.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_layout.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_regions.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_utils.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/loopcut.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_bake.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_internal.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_opengl.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_shading.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screendump.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sound/sound_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_panels.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/drawnode.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/IMB_filter.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/filter.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/imbuf_cocoa.m
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/iris.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/jp2.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/jpeg.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/png.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/scaling.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/targa.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/tiff.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_property.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rendercore.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-onion-uv-tools/source/creator/creator.c
branches/soc-2011-onion-uv-tools/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/common/bmfont.cpp
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39665-42025
+ /trunk/blender:39665-42050
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/__init__.py 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/__init__.py 2011-11-22 01:34:54 UTC (rev 42051)
@@ -43,7 +43,7 @@
class CyclesRender(bpy.types.RenderEngine):
bl_idname = 'CYCLES'
- bl_label = "Cycles"
+ bl_label = "Cycles Render"
bl_use_shading_nodes = True
def __init__(self):
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp 2011-11-22 01:34:54 UTC (rev 42051)
@@ -99,6 +99,9 @@
static void get_tex_mapping(TextureMapping *mapping, BL::TexMapping b_mapping)
{
+ if(!b_mapping)
+ return;
+
mapping->translation = get_float3(b_mapping.location());
mapping->rotation = get_float3(b_mapping.rotation());
mapping->scale = get_float3(b_mapping.scale());
@@ -110,6 +113,9 @@
static void get_tex_mapping(TextureMapping *mapping, BL::ShaderNodeMapping b_mapping)
{
+ if(!b_mapping)
+ return;
+
mapping->translation = get_float3(b_mapping.location());
mapping->rotation = get_float3(b_mapping.rotation());
mapping->scale = get_float3(b_mapping.scale());
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_bvh.h 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_bvh.h 2011-11-22 01:34:54 UTC (rev 42051)
@@ -97,11 +97,7 @@
float c1loz = nz.z * idir.z - ood.z;
float c1hiz = nz.w * idir.z - ood.z;
- float c0min_x = min(c0lox, c0hix);
- float c0min_y = min(c0loy, c0hiy);
- float c0min_z = min(c0loz, c0hiz);
-
- float c0min = max4(c0min_x, c0min_y, c0min_z, 0.0f);
+ float c0min = max4(min(c0lox, c0hix), min(c0loy, c0hiy), min(c0loz, c0hiz), 0.0f);
float c0max = min4(max(c0lox, c0hix), max(c0loy, c0hiy), max(c0loz, c0hiz), t);
float c1lox = n1xy.x * idir.x - ood.x;
float c1hix = n1xy.y * idir.x - ood.x;
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/util/util_math.h
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/util/util_math.h 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/util/util_math.h 2011-11-22 01:34:54 UTC (rev 42051)
@@ -115,12 +115,12 @@
__device_inline float min4(float a, float b, float c, float d)
{
- return min(min(min(a, b), c), d);
+ return min(min(a, b), min(c, d));
}
__device_inline float max4(float a, float b, float c, float d)
{
- return max(max(max(a, b), c), d);
+ return max(max(a, b), max(c, d));
}
#ifndef __KERNEL_OPENCL__
Modified: branches/soc-2011-onion-uv-tools/release/datafiles/fonts/droidsans.ttf.gz
===================================================================
(Binary files differ)
Modified: branches/soc-2011-onion-uv-tools/release/scripts/modules/addon_utils.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/modules/addon_utils.py 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/release/scripts/modules/addon_utils.py 2011-11-22 01:34:54 UTC (rev 42051)
@@ -146,7 +146,10 @@
for path in path_list:
# force all contrib addons to be 'TESTING'
- force_support = 'TESTING' if path.endswith("addons_contrib") else None
+ if path.endswith("addons_contrib") or path.endswith("addons_extern"):
+ force_support = 'TESTING'
+ else:
+ force_support = None
for mod_name, mod_path in _bpy.path.module_names(path):
modules_stale -= {mod_name}
Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py 2011-11-22 01:34:54 UTC (rev 42051)
@@ -77,11 +77,11 @@
return {'FINISHED'}
-class CLIP_OT_tracks_to_mesh(Operator):
- """Create vertex cloud using coordinates of tracks"""
+class CLIP_OT_bundles_to_mesh(Operator):
+ """Create vertex cloud using coordinates of reconstructed tracks"""
- bl_idname = "clip.tracks_to_mesh"
- bl_label = "Tracks to Mesh"
+ bl_idname = "clip.bundles_to_mesh"
+ bl_label = "3D Markers to Mesh"
bl_options = {'UNDO', 'REGISTER'}
@classmethod
Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py 2011-11-22 01:34:54 UTC (rev 42051)
@@ -452,66 +452,22 @@
layout = self.layout
rd = context.scene.render
- file_format = rd.file_format
+ image_settings = rd.image_settings
+ file_format = rd.image_settings.file_format
layout.prop(rd, "filepath", text="")
split = layout.split()
col = split.column()
- col.prop(rd, "file_format", text="")
- col.row().prop(rd, "color_mode", text="Color", expand=True)
+ col.template_image_settings(rd.image_settings)
col = split.column()
col.prop(rd, "use_file_extension")
col.prop(rd, "use_overwrite")
col.prop(rd, "use_placeholder")
- if file_format in {'AVI_JPEG', 'JPEG'}:
- layout.prop(rd, "file_quality", slider=True)
-
- if file_format == 'PNG':
- layout.prop(rd, "file_quality", slider=True, text="Compression")
-
- if file_format in {'OPEN_EXR', 'MULTILAYER'}:
- row = layout.row()
- row.prop(rd, "exr_codec", text="Codec")
-
- if file_format == 'OPEN_EXR':
- row = layout.row()
- row.prop(rd, "use_exr_half")
- row.prop(rd, "exr_zbuf")
- row.prop(rd, "exr_preview")
-
- elif file_format == 'JPEG2000':
- split = layout.split()
- col = split.column()
- col.label(text="Depth:")
- col.row().prop(rd, "jpeg2k_depth", expand=True)
-
- col = split.column()
- col.prop(rd, "jpeg2k_preset", text="")
- col.prop(rd, "jpeg2k_ycc")
-
- elif file_format in {'CINEON', 'DPX'}:
-
- split = layout.split()
- split.label("FIXME: hard coded Non-Linear, Gamma:1.0")
- '''
- col = split.column()
- col.prop(rd, "use_cineon_log", text="Convert to Log")
-
- col = split.column(align=True)
- col.active = rd.use_cineon_log
- col.prop(rd, "cineon_black", text="Black")
- col.prop(rd, "cineon_white", text="White")
- col.prop(rd, "cineon_gamma", text="Gamma")
- '''
-
- elif file_format == 'TIFF':
- layout.prop(rd, "use_tiff_16bit")
-
- elif file_format == 'QUICKTIME_CARBON':
+ if file_format == 'QUICKTIME_CARBON':
layout.operator("scene.render_data_set_quicktime_codec")
elif file_format == 'QUICKTIME_QTKIT':
@@ -552,7 +508,7 @@
@classmethod
def poll(cls, context):
rd = context.scene.render
- return rd.file_format in {'FFMPEG', 'XVID', 'H264', 'THEORA'}
+ return rd.image_settings.file_format in {'FFMPEG', 'XVID', 'H264', 'THEORA'}
def draw(self, context):
layout = self.layout
Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py 2011-11-22 01:34:54 UTC (rev 42051)
@@ -210,7 +210,7 @@
def draw(self, context):
layout = self.layout
- layout.operator("clip.tracks_to_mesh")
+ layout.operator("clip.bundles_to_mesh")
layout.operator("clip.track_to_empty")
@@ -402,15 +402,15 @@
col.prop(sc, "show_marker_search", text="Search")
col.prop(sc, "show_pyramid_levels", text="Pyramid")
- col.prop(sc, "show_track_path", text="Track Path")
+ col.prop(sc, "show_track_path", text="Path")
row = col.row()
row.active = sc.show_track_path
row.prop(sc, "path_length", text="Length")
col.prop(sc, "show_disabled", "Disabled Tracks")
- col.prop(sc, "show_bundles", text="Bundles")
+ col.prop(sc, "show_bundles", text="3D Markers")
- col.prop(sc, "show_names", text="Track Names and Status")
+ col.prop(sc, "show_names", text="Names and Status")
col.prop(sc, "show_tiny_markers", text="Compact Markers")
col.prop(sc, "show_grease_pencil", text="Grease Pencil")
Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py 2011-11-22 00:35:26 UTC (rev 42050)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py 2011-11-22 01:34:54 UTC (rev 42051)
@@ -2203,7 +2203,7 @@
col = layout.column()
col.active = view.show_reconstruction
- col.prop(view, "show_tracks_name")
+ col.prop(view, "show_bundle_names")
col.prop(view, "show_camera_path")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list