Revision: 30230
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30230
Author: campbellbarton
Date: 2010-07-12 17:18:09 +0200 (Mon, 12 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender
-r30216:30229
Modified Paths:
--------------
branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/render25/projectfiles_vc9/blender/blender.vcproj
branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/render25/release/scripts/ui/properties_data_armature.py
branches/render25/release/scripts/ui/space_info.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/blenkernel/intern/seqeffects.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/editors/interface/interface_panel.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/transform/transform_snap.c
branches/render25/source/blender/imbuf/IMB_imbuf.h
branches/render25/source/blender/imbuf/intern/divers.c
branches/render25/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/render25/source/blender/makesdna/DNA_armature_types.h
branches/render25/source/blender/makesdna/DNA_userdef_types.h
branches/render25/source/blender/makesrna/intern/rna_armature.c
branches/render25/source/blender/makesrna/intern/rna_userdef.c
branches/render25/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj
===================================================================
--- branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj 2010-07-12
14:57:24 UTC (rev 30229)
+++ branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj 2010-07-12
15:18:09 UTC (rev 30230)
@@ -469,6 +469,10 @@
>
</File>
<File
+ RelativePath="..\..\GHOST_Path-api.h"
+ >
+ </File>
+ <File
RelativePath="..\..\GHOST_Rect.h"
>
</File>
@@ -526,6 +530,10 @@
>
</File>
<File
+ RelativePath="..\..\intern\GHOST_Path-api.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\intern\GHOST_Rect.cpp"
>
</File>
Modified: branches/render25/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/blender.vcproj 2010-07-12
14:57:24 UTC (rev 30229)
+++ branches/render25/projectfiles_vc9/blender/blender.vcproj 2010-07-12
15:18:09 UTC (rev 30230)
@@ -74,7 +74,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="libsamplerate.lib
SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib wrap_oal.lib ws2_32.lib
dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib
zlib.lib python31.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib
Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib
avutil-50.lib swscale-0.lib avdevice-52.lib libsndfile-1.lib
OpenCOLLADABaseUtils.lib OpenCOLLADAFramework.lib OpenCOLLADAStreamWriter.lib
OpenCOLLADASaxFrameworkLoader.lib pcre.lib UTF.lib GeneratedSaxParser.lib
MathMLSolver.lib xml2.lib buffer.lib ftoa.lib"
+ AdditionalDependencies="libsamplerate.lib
SDL.lib freetype2ST.lib gnu_gettext.lib qtmlClient.lib wrap_oal.lib ws2_32.lib
dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib
zlib.lib python31.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half.lib
Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-52.lib avformat-52.lib
avutil-50.lib swscale-0.lib avdevice-52.lib libsndfile-1.lib
OpenCOLLADABaseUtils.lib OpenCOLLADAFramework.lib OpenCOLLADAStreamWriter.lib
OpenCOLLADASaxFrameworkLoader.lib pcre.lib GeneratedSaxParser.lib
MathMLSolver.lib xml2.lib buffer.lib ftoa.lib"
ShowProgress="0"
OutputFile="..\..\..\install\msvc_9\blender.exe"
LinkIncremental="1"
@@ -169,7 +169,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386
"
- AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib
libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python31_d.lib
pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib Imath_d.lib
IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib avdevice-52.lib
avutil-50.lib swscale-0.lib libsndfile-1.lib libsamplerate.lib libjack.lib
OpenCOLLADABaseUtils_d.lib OpenCOLLADAFramework_d.lib
OpenCOLLADAStreamWriter_d.lib OpenCOLLADASaxFrameworkLoader_d.lib pcre_d.lib
UTF_d.lib GeneratedSaxParser_d.lib MathMLSolver_d.lib xml2_d.lib buffer_d.lib
ftoa_d.lib"
+ AdditionalDependencies="SDL.lib freetype2ST.lib
gnu_gettext.lib qtmlClient.lib wrap_oal.lib ws2_32.lib dxguid.lib opengl32.lib
libjpeg.lib glu32.lib vfw32.lib winmm.lib libpng_st.lib zlib.lib python31_d.lib
pthreadVSE2.lib pthreadVC2.lib libtiff.lib Half_d.lib Iex_d.lib Imath_d.lib
IlmImf_d.lib IlmThread_d.lib avcodec-52.lib avformat-52.lib avdevice-52.lib
avutil-50.lib swscale-0.lib libsndfile-1.lib libsamplerate.lib libjack.lib
OpenCOLLADABaseUtils_d.lib OpenCOLLADAFramework_d.lib
OpenCOLLADAStreamWriter_d.lib OpenCOLLADASaxFrameworkLoader_d.lib pcre_d.lib
GeneratedSaxParser_d.lib MathMLSolver_d.lib xml2_d.lib buffer_d.lib ftoa_d.lib"
ShowProgress="0"
OutputFile="..\..\..\install\msvc_9d\blender.exe"
LinkIncremental="2"
Modified: branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
2010-07-12 14:57:24 UTC (rev 30229)
+++ branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
2010-07-12 15:18:09 UTC (rev 30230)
@@ -528,6 +528,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenlib\intern\cpu.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\DLRB_tree.c"
>
</File>
@@ -685,6 +689,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\blenlib\BLI_cpu.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\BLI_dlrbTree.h"
>
</File>
Modified: branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
2010-07-12 14:57:24 UTC (rev 30229)
+++ branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
2010-07-12 15:18:09 UTC (rev 30230)
@@ -590,6 +590,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\imbuf\intern\thumbs_blend.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\imbuf\intern\tiff.c"
>
</File>
Modified:
branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2010-07-12 14:57:24 UTC (rev 30229)
+++ branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
2010-07-12 15:18:09 UTC (rev 30230)
@@ -606,6 +606,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_actuator_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_animation.c"
>
</File>
@@ -658,6 +662,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_controller_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_curve.c"
>
</File>
@@ -810,10 +818,18 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_sensor_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_sequencer.c"
>
</File>
<File
+
RelativePath="..\..\..\source\blender\makesrna\intern\rna_sequencer_api.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesrna\intern\rna_smoke.c"
>
</File>
Modified: branches/render25/release/scripts/ui/properties_data_armature.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_armature.py
2010-07-12 14:57:24 UTC (rev 30229)
+++ branches/render25/release/scripts/ui/properties_data_armature.py
2010-07-12 15:18:09 UTC (rev 30230)
@@ -93,7 +93,6 @@
if wide_ui:
col = split.column()
col.prop(arm, "deform_quaternion", text="Quaternion")
- col.prop(arm, "deform_bbone_rest", text="B-Bones Rest")
class DATA_PT_display(DataButtonsPanel):
@@ -122,7 +121,6 @@
col = split.column()
col.prop(arm, "draw_group_colors", text="Colors")
col.prop(arm, "delay_deform", text="Delay Refresh")
- col.prop(ob, "x_ray", text="X-Ray (Object)")
class DATA_PT_bone_groups(DataButtonsPanel):
Modified: branches/render25/release/scripts/ui/space_info.py
===================================================================
--- branches/render25/release/scripts/ui/space_info.py 2010-07-12 14:57:24 UTC
(rev 30229)
+++ branches/render25/release/scripts/ui/space_info.py 2010-07-12 15:18:09 UTC
(rev 30230)
@@ -329,7 +329,7 @@
class HELP_OT_operator_cheat_sheet(bpy.types.Operator):
bl_idname = "help.operator_cheat_sheet"
- bl_label = "Operator Cheat Sheet (new textblock)"
+ bl_label = "Operator Cheat Sheet"
def execute(self, context):
op_strings = []
Modified: branches/render25/release/scripts/ui/space_userpref.py
===================================================================
--- branches/render25/release/scripts/ui/space_userpref.py 2010-07-12
14:57:24 UTC (rev 30229)
+++ branches/render25/release/scripts/ui/space_userpref.py 2010-07-12
15:18:09 UTC (rev 30230)
@@ -162,7 +162,6 @@
col.prop(view, "show_view_name", text="View Name")
col.prop(view, "show_playback_fps", text="Playback FPS")
col.prop(view, "global_scene")
- col.prop(view, "pin_floating_panels")
col.prop(view, "object_origin_size")
col.separator()
@@ -281,13 +280,6 @@
row.separator()
col = row.column()
- col.label(text="Snap:")
- col.prop(edit, "snap_translate", text="Translate")
- col.prop(edit, "snap_rotate", text="Rotate")
- col.prop(edit, "snap_scale", text="Scale")
- col.separator()
- col.separator()
- col.separator()
col.label(text="Grease Pencil:")
col.prop(edit, "grease_pencil_manhattan_distance", text="Manhattan
Distance")
col.prop(edit, "grease_pencil_euclidean_distance", text="Euclidean
Distance")
Modified: branches/render25/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/armature.c
2010-07-12 14:57:24 UTC (rev 30229)
+++ branches/render25/source/blender/blenkernel/intern/armature.c
2010-07-12 15:18:09 UTC (rev 30230)
@@ -687,11 +687,11 @@
/* ************ Armature Deform ******************* */
-static void pchan_b_bone_defmats(bPoseChannel *pchan, int use_quaternion, int
rest_def)
+static void pchan_b_bone_defmats(bPoseChannel *pchan, int use_quaternion)
{
Bone *bone= pchan->bone;
Mat4 *b_bone= b_bone_spline_setup(pchan, 0);
- Mat4 *b_bone_rest= (rest_def)? NULL: b_bone_spline_setup(pchan, 1);
+ Mat4 *b_bone_rest= b_bone_spline_setup(pchan, 1);
Mat4 *b_bone_mats;
DualQuat *b_bone_dual_quats= NULL;
float tmat[4][4];
@@ -718,10 +718,7 @@
unit_m4(tmat);
for(a=0; a<bone->segments; a++) {
- if(b_bone_rest)
- invert_m4_m4(tmat, b_bone_rest[a].mat);
- else
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
