[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27722] branches/render25: svn merge https ://svn.blender.org/svnroot/bf-blender/trunk/blender -r27711:27721
Campbell Barton
ideasman42 at gmail.com
Wed Mar 24 17:28:14 CET 2010
Revision: 27722
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27722
Author: campbellbarton
Date: 2010-03-24 17:28:13 +0100 (Wed, 24 Mar 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27711:27721
Modified Paths:
--------------
branches/render25/release/scripts/keyingsets/keyingsets_utils.py
branches/render25/release/scripts/ui/space_dopesheet.py
branches/render25/release/scripts/ui/space_graph.py
branches/render25/release/scripts/ui/space_image.py
branches/render25/release/scripts/ui/space_nla.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenfont/intern/blf_lang.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenlib/intern/uvproject.c
branches/render25/source/blender/editors/animation/keyingsets.c
branches/render25/source/blender/editors/include/ED_keyframing.h
branches/render25/source/blender/makesrna/intern/rna_animation.c
branches/render25/source/blender/makesrna/intern/rna_animation_api.c
branches/render25/source/blender/makesrna/intern/rna_armature_api.c
branches/render25/source/blender/makesrna/intern/rna_constraint.c
branches/render25/source/blender/makesrna/intern/rna_render.c
branches/render25/source/blender/makesrna/intern/rna_scene_api.c
branches/render25/source/blender/makesrna/intern/rna_smoke.c
branches/render25/source/blender/makesrna/intern/rna_ui_api.c
branches/render25/source/blender/makesrna/intern/rna_wm_api.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_gesture.c
branches/render25/source/blender/windowmanager/intern/wm_jobs.c
branches/render25/source/blender/windowmanager/intern/wm_subwindow.c
branches/render25/source/creator/creator.c
Modified: branches/render25/release/scripts/keyingsets/keyingsets_utils.py
===================================================================
--- branches/render25/release/scripts/keyingsets/keyingsets_utils.py 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/release/scripts/keyingsets/keyingsets_utils.py 2010-03-24 16:28:13 UTC (rev 27722)
@@ -57,20 +57,16 @@
# try to get the animation data associated with the closest
# ID-block to the data (neither of which may exist/be easy to find)
id_block = data.id_data
- try:
- adt = id_block.animation_data
- except:
- # there isn't any animation data available
- return;
-
+ adt = getattr(id_block, "animation_data", None)
+
# there must also be an active action...
- if adt.action is None:
+ if adt is None or adt.action is None:
return;
# for each F-Curve, include an path to key it
# NOTE: we don't need to set the group settings here
for fcu in adt.action.fcurves:
- ks.add_path(id_block, fcu.rna_path, array_index=fcu.array_index, entire_array=False)
+ ks.add_path(id_block, fcu.data_path, index=fcu.array_index)
# ------
@@ -89,14 +85,11 @@
else:
# get the path to the ID-block
path = data.path_to_id()
+
+ # try to use the name of the data element to group the F-Curve
+ # else fallback on the KeyingSet name
+ grouping = getattr(data, "name", None)
- try:
- # try to use the name of the data element to group the F-Curve
- grouping = data.name
- except:
- # fallback on the KeyingSet name
- grouping = None;
-
# return the ID-block and the path
return id_block, path, grouping
Modified: branches/render25/release/scripts/ui/space_dopesheet.py
===================================================================
--- branches/render25/release/scripts/ui/space_dopesheet.py 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/release/scripts/ui/space_dopesheet.py 2010-03-24 16:28:13 UTC (rev 27722)
@@ -155,8 +155,8 @@
layout.column()
layout.menu("DOPESHEET_MT_key_transform", text="Transform")
- layout.operator_menu_enum("action.snap", property="type", text="Snap")
- layout.operator_menu_enum("action.mirror", property="type", text="Mirror")
+ layout.operator_menu_enum("action.snap", "type", text="Snap")
+ layout.operator_menu_enum("action.mirror", "type", text="Mirror")
layout.separator()
layout.operator("action.keyframe_insert")
@@ -166,10 +166,10 @@
layout.operator("action.delete")
layout.separator()
- layout.operator_menu_enum("action.keyframe_type", property="type", text="Keyframe Type")
- layout.operator_menu_enum("action.handle_type", property="type", text="Handle Type")
- layout.operator_menu_enum("action.interpolation_type", property="type", text="Interpolation Mode")
- layout.operator_menu_enum("action.extrapolation_type", property="type", text="Extrapolation Mode")
+ layout.operator_menu_enum("action.keyframe_type", "type", text="Keyframe Type")
+ layout.operator_menu_enum("action.handle_type", "type", text="Handle Type")
+ layout.operator_menu_enum("action.interpolation_type", "type", text="Interpolation Mode")
+ layout.operator_menu_enum("action.extrapolation_type", "type", text="Extrapolation Mode")
layout.separator()
layout.operator("action.clean")
Modified: branches/render25/release/scripts/ui/space_graph.py
===================================================================
--- branches/render25/release/scripts/ui/space_graph.py 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/release/scripts/ui/space_graph.py 2010-03-24 16:28:13 UTC (rev 27722)
@@ -142,6 +142,7 @@
layout.separator()
layout.operator("anim.channels_editable_toggle")
+ layout.operator("anim.channels_visibility_set")
layout.separator()
layout.operator("anim.channels_expand")
@@ -160,8 +161,8 @@
layout.column()
layout.menu("GRAPH_MT_key_transform", text="Transform")
- layout.operator_menu_enum("graph.snap", property="type", text="Snap")
- layout.operator_menu_enum("graph.mirror", property="type", text="Mirror")
+ layout.operator_menu_enum("graph.snap", "type", text="Snap")
+ layout.operator_menu_enum("graph.mirror", "type", text="Mirror")
layout.separator()
layout.operator("graph.keyframe_insert")
@@ -172,9 +173,9 @@
layout.operator("graph.delete")
layout.separator()
- layout.operator_menu_enum("graph.handle_type", property="type", text="Handle Type")
- layout.operator_menu_enum("graph.interpolation_type", property="type", text="Interpolation Mode")
- layout.operator_menu_enum("graph.extrapolation_type", property="type", text="Extrapolation Mode")
+ layout.operator_menu_enum("graph.handle_type", "type", text="Handle Type")
+ layout.operator_menu_enum("graph.interpolation_type", "type", text="Interpolation Mode")
+ layout.operator_menu_enum("graph.extrapolation_type", "type", text="Extrapolation Mode")
layout.separator()
layout.operator("graph.clean")
Modified: branches/render25/release/scripts/ui/space_image.py
===================================================================
--- branches/render25/release/scripts/ui/space_image.py 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/release/scripts/ui/space_image.py 2010-03-24 16:28:13 UTC (rev 27722)
@@ -586,7 +586,7 @@
brush = toolsettings.brush
layout.template_curve_mapping(brush, "curve")
- layout.operator_menu_enum("brush.curve_preset", property="shape")
+ layout.operator_menu_enum("brush.curve_preset", "shape")
classes = [
Modified: branches/render25/release/scripts/ui/space_nla.py
===================================================================
--- branches/render25/release/scripts/ui/space_nla.py 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/release/scripts/ui/space_nla.py 2010-03-24 16:28:13 UTC (rev 27722)
@@ -102,7 +102,7 @@
layout.column()
layout.menu("NLA_MT_edit_transform", text="Transform")
- layout.operator_menu_enum("nla.snap", property="type", text="Snap")
+ layout.operator_menu_enum("nla.snap", "type", text="Snap")
layout.separator()
layout.operator("nla.duplicate")
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-03-24 16:28:13 UTC (rev 27722)
@@ -384,7 +384,7 @@
layout.operator("object.select_random", text="Random")
layout.operator("object.select_mirror", text="Mirror")
layout.operator("object.select_by_layer", text="Select All by Layer")
- layout.operator_menu_enum("object.select_by_type", "type", "", text="Select All by Type...")
+ layout.operator_menu_enum("object.select_by_type", "type", text="Select All by Type...")
layout.operator("object.select_camera", text="Select Camera")
layout.separator()
@@ -834,7 +834,7 @@
layout.operator_menu_enum("object.make_links_scene", "type", text="Objects to Scene...")
layout.operator_menu_enum("marker.make_links_scene", "type", text="Markers to Scene...")
- layout.operator_enums("object.make_links_data", property="type") # inline
+ layout.operator_enums("object.make_links_data", "type") # inline
# ********** Vertex paint menu **********
@@ -930,7 +930,7 @@
layout.prop(sculpt, "lock_y")
layout.prop(sculpt, "lock_z")
layout.separator()
- layout.operator_menu_enum("brush.curve_preset", property="shape")
+ layout.operator_menu_enum("brush.curve_preset", "shape")
layout.separator()
sculpt_tool = brush.sculpt_tool
Modified: branches/render25/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/render25/source/blender/blenfont/intern/blf_lang.c 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/source/blender/blenfont/intern/blf_lang.c 2010-03-24 16:28:13 UTC (rev 27722)
@@ -45,7 +45,6 @@
#include "BLI_linklist.h" /* linknode */
#include "BLI_string.h"
-#include "BIF_gl.h"
#ifdef __APPLE__
#include "BKE_utildefines.h"
Modified: branches/render25/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/source/blender/blenkernel/intern/modifier.c 2010-03-24 16:28:13 UTC (rev 27722)
@@ -3690,8 +3690,8 @@
int num_projectors = 0;
float aspect;
char uvname[32];
- float aspx= umd->aspectx ? 1.0f : umd->aspectx;
- float aspy= umd->aspecty ? 1.0f : umd->aspecty;
+ float aspx= umd->aspectx ? umd->aspectx : 1.0f;
+ float aspy= umd->aspecty ? umd->aspecty : 1.0f;
int free_uci= 0;
aspect = aspx / aspy;
Modified: branches/render25/source/blender/blenlib/intern/uvproject.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/uvproject.c 2010-03-24 16:23:42 UTC (rev 27721)
+++ branches/render25/source/blender/blenlib/intern/uvproject.c 2010-03-24 16:28:13 UTC (rev 27722)
@@ -56,28 +56,31 @@
if(uci->do_pano) {
float angle= atan2f(pv4[0], -pv4[2]) / (M_PI * 2.0); /* angle around the camera */
if (uci->do_persp==0) {
- target[0] = angle; /* no correct method here, just map to 0-1 */
- target[1] = pv4[1] / uci->camsize;
+ target[0]= angle; /* no correct method here, just map to 0-1 */
+ target[1]= pv4[1] / uci->camsize;
}
else {
float vec2d[2]= {pv4[0], pv4[2]}; /* 2D position from the camera */
- target[0] = angle * (M_PI / uci->camangle);
- target[1] = pv4[1] / (len_v2(vec2d) * uci->camsize);
+ target[0]= angle * (M_PI / uci->camangle);
+ target[1]= pv4[1] / (len_v2(vec2d) * uci->camsize);
}
}
else {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list