[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47516] branches/soc-2012-bratwurst: merge with trunk 47515
Antony Riakiotakis
kalast at gmail.com
Wed Jun 6 16:01:13 CEST 2012
Revision: 47516
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47516
Author: psy-fi
Date: 2012-06-06 14:01:01 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
merge with trunk 47515
Modified Paths:
--------------
branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-i686.py
branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cloth.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/collision.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/library.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/movieclip.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/smoke.c
branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature.c
branches/soc-2012-bratwurst/source/blender/editors/curve/curve_ops.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editcurve.c
branches/soc-2012-bratwurst/source/blender/editors/curve/lorem.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_view3d.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_panel.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-bratwurst/source/blender/editors/interface/resources.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_edit.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_intern.h
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_shapekey.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_edit.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_lattice.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_editor.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/SConscript
branches/soc-2012-bratwurst/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/makesrna/intern/SConscript
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2012-bratwurst/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2012-bratwurst/source/blender/render/intern/source/envmap.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/volumetric.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/voxeldata.c
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/FilterColor.h
Added Paths:
-----------
branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:46808-47468
+ /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
/trunk/blender:46808-47515
Modified: branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-i686.py 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-i686.py 2012-06-06 14:01:01 UTC (rev 47516)
@@ -97,6 +97,7 @@
# Cycles
WITH_BF_CYCLES = True
WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Modified: branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-x86_64.py 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/build_files/buildbot/config/user-config-x86_64.py 2012-06-06 14:01:01 UTC (rev 47516)
@@ -97,6 +97,7 @@
# Cycles
WITH_BF_CYCLES = True
WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Copied: branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py (from rev 47515, trunk/blender/doc/python_api/examples/bpy.types.Object.py)
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py (rev 0)
+++ branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Object.py 2012-06-06 14:01:01 UTC (rev 47516)
@@ -0,0 +1,27 @@
+"""
+Basic Object Operations Example
++++++++++++++++++++++++++++++++
+This script demonstrates basic operations on object like creating new
+object, placing it into scene, selecting it and making it active
+"""
+
+import bpy
+from mathutils import Matrix
+
+scene = bpy.context.scene
+
+# Create new lamp datablock
+lamp_data = bpy.data.lamps.new(name="New Lamp", type="POINT")
+
+# Create new object with out lamp datablock
+lamp_object = bpy.data.objects.new(name="New Lamp", object_data=lamp_data)
+
+# Link lamp object to the scene so it'll appear in this scene
+scene.objects.link(lamp_object)
+
+# Place lamp to specified location
+lamp_object.location = (5.0, 5.0, 5.0)
+
+# And finally select it make active
+lamp_object.select = True
+scene.objects.active = lamp_object
Modified: branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_checker_texture.osl 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_checker_texture.osl 2012-06-06 14:01:01 UTC (rev 47516)
@@ -42,9 +42,9 @@
shader node_checker_texture(
float Scale = 5.0,
point Vector = P,
- color Color1 = color(0.8, 0.8, 0.8);
- color Color2 = color(0.2, 0.2, 0.2);
- output float Fac = 0.0)
+ color Color1 = color(0.8, 0.8, 0.8),
+ color Color2 = color(0.2, 0.2, 0.2),
+ output float Fac = 0.0,
output color Color = color(0.0, 0.0, 0.0))
{
Fac = checker(Vector*Scale);
Modified: branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.cpp 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.cpp 2012-06-06 14:01:01 UTC (rev 47516)
@@ -72,7 +72,7 @@
int object = sd->object;
if (object != ~0) {
- Transform tfm = object_fetch_transform(kg, object, OBJECT_TRANSFORM);
+ Transform tfm = object_fetch_transform(kg, object, time, OBJECT_TRANSFORM);
tfm = transform_transpose(tfm);
result = TO_MATRIX44(tfm);
@@ -93,7 +93,7 @@
int object = sd->object;
if (object != ~0) {
- Transform tfm = object_fetch_transform(kg, object, OBJECT_INVERSE_TRANSFORM);
+ Transform tfm = object_fetch_transform(kg, object, time, OBJECT_INVERSE_TRANSFORM);
tfm = transform_transpose(tfm);
result = TO_MATRIX44(tfm);
Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_cloth.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_cloth.py 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_cloth.py 2012-06-06 14:01:01 UTC (rev 47516)
@@ -145,6 +145,7 @@
cloth = context.cloth.collision_settings
md = context.cloth
+ ob = context.object
layout.active = cloth.use_collision and cloth_panel_enabled(md)
@@ -163,6 +164,7 @@
sub.active = cloth.use_self_collision
sub.prop(cloth, "self_collision_quality", slider=True, text="Quality")
sub.prop(cloth, "self_distance_min", slider=True, text="Distance")
+ sub.prop_search(cloth, "vertex_group_self_collisions", ob, "vertex_groups", text="")
layout.prop(cloth, "group")
Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py 2012-06-06 14:01:01 UTC (rev 47516)
@@ -958,13 +958,13 @@
sc = context.space_data
clip = sc.clip
- if clip:
- layout.template_movieclip(sc, "clip", compact=True)
- else:
- layout.operator("clip.open", icon='FILESEL')
+ col = layout.column()
+ col.template_movieclip(sc, "clip", compact=True)
+ col.prop(clip, "use_custom_start_frame")
+ if clip.use_custom_start_frame:
+ col.prop(clip, "start_frame")
-
class CLIP_PT_tools_clip(CLIP_PT_clip_view_panel, Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'TOOLS'
@@ -1225,12 +1225,9 @@
layout.operator("mask.parent_set")
layout.separator()
- layout.operator("mask.shape_key_clear")
- layout.operator("mask.shape_key_insert")
-
- layout.separator()
layout.menu("CLIP_MT_mask_visibility")
layout.menu("CLIP_MT_mask_transform")
+ layout.menu("CLIP_MT_mask_animation")
class CLIP_MT_mask_visibility(Menu):
@@ -1259,6 +1256,17 @@
props.mode = 'MASK_SHRINKFATTEN'
+class CLIP_MT_mask_animation(Menu):
+ bl_label = "Animation"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("mask.shape_key_clear")
+ layout.operator("mask.shape_key_insert")
+ layout.operator("mask.shape_key_feather_reset")
+
+
class CLIP_MT_camera_presets(Menu):
"""Predefined tracking camera intrinsics"""
bl_label = "Camera Presets"
Modified: branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cloth.h 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cloth.h 2012-06-06 14:01:01 UTC (rev 47516)
@@ -56,7 +56,7 @@
/* Bits to or into the ClothVertex.flags. */
#define CLOTH_VERT_FLAG_PINNED 1
-#define CLOTH_VERT_FLAG_COLLISION 2
+#define CLOTH_VERT_FLAG_NOSELFCOLL 2 /* vertex NOT used for self collisions */
#define CLOTH_VERT_FLAG_PINNED_EM 3
/**
Modified: branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h 2012-06-06 13:30:05 UTC (rev 47515)
+++ branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h 2012-06-06 14:01:01 UTC (rev 47516)
@@ -141,11 +141,13 @@
struct MaskLayerShape *masklay_shape_a,
struct MaskLayerShape *masklay_shape_b,
const float fac);
-struct MaskLayerShape *BKE_mask_layer_shape_find_frame(struct MaskLayer *masklay, int frame);
-int BKE_mask_layer_shape_find_frame_range(struct MaskLayer *masklay, int frame,
+struct MaskLayerShape *BKE_mask_layer_shape_find_frame(struct MaskLayer *masklay, const int frame);
+int BKE_mask_layer_shape_find_frame_range(struct MaskLayer *masklay, const int frame,
struct MaskLayerShape **r_masklay_shape_a,
struct MaskLayerShape **r_masklay_shape_b);
-struct MaskLayerShape *BKE_mask_layer_shape_varify_frame(struct MaskLayer *masklay, int frame);
+struct MaskLayerShape *BKE_mask_layer_shape_alloc(struct MaskLayer *masklay, const int frame);
+void BKE_mask_layer_shape_free(struct MaskLayerShape *masklay_shape);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list