[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47535] branches/soc-2011-tomato: Merging r47507 through r47534 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jun 6 21:11:15 CEST 2012
Revision: 47535
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47535
Author: nazgul
Date: 2012-06-06 19:11:06 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Merging r47507 through r47534 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47507
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47534
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_fresnel.h
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_cloth.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/include/ED_clip.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mask.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.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/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-tomato/source/blender/makesrna/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
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_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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47506
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47534
Modified: branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_checker_texture.osl 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_checker_texture.osl 2012-06-06 19:11:06 UTC (rev 47535)
@@ -23,13 +23,13 @@
float checker(point p)
{
- p[0] = (p[0] + 0.00001)*0.9999);
- p[1] = (p[1] + 0.00001)*0.9999);
- p[2] = (p[2] + 0.00001)*0.9999);
+ p[0] = (p[0] + 0.00001)*0.9999;
+ p[1] = (p[1] + 0.00001)*0.9999;
+ p[2] = (p[2] + 0.00001)*0.9999;
- int xi = fabs(floor(p[0]));
- int yi = fabs(floor(p[1]));
- int zi = fabs(floor(p[2]));
+ int xi = (int)fabs(floor(p[0]));
+ int yi = (int)fabs(floor(p[1]));
+ int zi = (int)fabs(floor(p[2]));
if((xi % 2 == yi % 2) == (zi % 2)) {
return 1.0;
Modified: branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_fresnel.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_fresnel.h 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_fresnel.h 2012-06-06 19:11:06 UTC (rev 47535)
@@ -1,4 +1,19 @@
-
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
float fresnel_dielectric(vector Incoming, normal Normal, float eta)
{
/* compute fresnel reflectance without explicitly computing
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_bone.py 2012-06-06 19:11:06 UTC (rev 47535)
@@ -119,23 +119,30 @@
bone = context.bone
pchan = ob.pose.bones[bone.name]
- row = layout.row()
- col = row.column()
- col.prop(pchan, "lock_location")
- col.active = not (bone.parent and bone.use_connect)
+ split = layout.split(percentage=0.1)
+
+ col = split.column(align=True)
+ col.label(text="")
+ col.label(text="X:")
+ col.label(text="Y:")
+ col.label(text="Z:")
+
+ col = split.row()
+ sub = col.row()
+ sub.active = not (bone.parent and bone.use_connect)
+ sub.column().prop(pchan, "lock_location", text="Location")
+ col.column().prop(pchan, "lock_rotation", text="Rotation")
+ col.column().prop(pchan, "lock_scale", text="Scale")
- col = row.column()
if pchan.rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
- col.prop(pchan, "lock_rotations_4d", text="Lock Rotation")
- if pchan.lock_rotations_4d:
- col.prop(pchan, "lock_rotation_w", text="W")
- col.prop(pchan, "lock_rotation", text="")
- else:
- col.prop(pchan, "lock_rotation", text="Rotation")
+ row = layout.row()
+ row.prop(pchan, "lock_rotations_4d", text="Lock Rotation")
+
+ sub = row.row()
+ sub.active = pchan.lock_rotations_4d
+ sub.prop(pchan, "lock_rotation_w", text="W")
- row.column().prop(pchan, "lock_scale")
-
class BONE_PT_relations(BoneButtonsPanel, Panel):
bl_label = "Relations"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py 2012-06-06 19:11:06 UTC (rev 47535)
@@ -104,23 +104,28 @@
ob = context.object
- row = layout.row()
+ split = layout.split(percentage=0.1)
+
+ col = split.column(align=True)
+ col.label(text="")
+ col.label(text="X:")
+ col.label(text="Y:")
+ col.label(text="Z:")
+
+ col = split.row()
+ col.column().prop(ob, "lock_location", text="Location")
+ col.column().prop(ob, "lock_rotation", text="Rotation")
+ col.column().prop(ob, "lock_scale", text="Scale")
- col = row.column()
- col.prop(ob, "lock_location", text="Location")
-
- col = row.column()
if ob.rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
- col.prop(ob, "lock_rotations_4d", text="Rotation")
- if ob.lock_rotations_4d:
- col.prop(ob, "lock_rotation_w", text="W")
- col.prop(ob, "lock_rotation", text="")
- else:
- col.prop(ob, "lock_rotation", text="Rotation")
+ row = layout.row()
+ row.prop(ob, "lock_rotations_4d", text="Lock Rotation")
+
+ sub = row.row()
+ sub.active = ob.lock_rotations_4d
+ sub.prop(ob, "lock_rotation_w", text="W")
- row.column().prop(ob, "lock_scale", text="Scale")
-
class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
bl_label = "Relations"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py 2012-06-06 19:11:06 UTC (rev 47535)
@@ -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-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-06-06 19:11:06 UTC (rev 47535)
@@ -948,9 +948,7 @@
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")
+ col.prop(clip, "start_frame")
class CLIP_PT_tools_clip(CLIP_PT_clip_view_panel, Panel):
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-06-06 19:11:06 UTC (rev 47535)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 263
-#define BLENDER_SUBVERSION 9
+#define BLENDER_SUBVERSION 10
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_cloth.h 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_cloth.h 2012-06-06 19:11:06 UTC (rev 47535)
@@ -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-2011-tomato/source/blender/blenkernel/BKE_movieclip.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h 2012-06-06 18:58:30 UTC (rev 47534)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_movieclip.h 2012-06-06 19:11:06 UTC (rev 47535)
@@ -63,6 +63,9 @@
void BKE_movieclip_build_proxy_frame(struct MovieClip *clip, int clip_flag, struct MovieDistortion *distortion,
int cfra, int *build_sizes, int build_count, int undistorted);
+int BKE_movieclip_remap_scene_to_clip_frame(struct MovieClip *clip, int framenr);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list