Revision: 27844
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27844
Author: yukishiro
Date: 2010-03-30 00:29:57 +0200 (Tue, 30 Mar 2010)
Log Message:
-----------
merge till 23196
Modified Paths:
--------------
branches/soc-2009-yukishiro/extern/Makefile
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
branches/soc-2009-yukishiro/release/io/export_ply.py
branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
branches/soc-2009-yukishiro/release/ui/buttons_data_text.py
branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
branches/soc-2009-yukishiro/release/ui/buttons_particle.py
branches/soc-2009-yukishiro/release/ui/space_info.py
branches/soc-2009-yukishiro/release/ui/space_userpref.py
branches/soc-2009-yukishiro/release/ui/space_view3d_toolbar.py
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_anim.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_library.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/anim.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/constraint.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/curve.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/font.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/lattice.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/object.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/smoke.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_arithb.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/arithb.c
branches/soc-2009-yukishiro/source/blender/blenloader/BLO_readfile.h
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/editors/armature/poselib.c
branches/soc-2009-yukishiro/source/blender/editors/armature/poseobject.c
branches/soc-2009-yukishiro/source/blender/editors/curve/curve_ops.c
branches/soc-2009-yukishiro/source/blender/editors/curve/editcurve.c
branches/soc-2009-yukishiro/source/blender/editors/curve/editfont.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen_types.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_intern.h
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-yukishiro/source/blender/editors/metaball/mball_edit.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_add.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_lattice.c
branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screendump.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2009-yukishiro/source/blender/editors/sound/sound_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_panels.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.h
branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/info_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_time/time_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2009-yukishiro/source/blender/imbuf/intern/anim.c
branches/soc-2009-yukishiro/source/blender/imbuf/intern/jp2.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_curve_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/python/generic/Mathutils.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2009-yukishiro/source/nan_definitions.mk
Added Paths:
-----------
branches/soc-2009-yukishiro/source/blender/editors/mesh/loopcut.c
Modified: branches/soc-2009-yukishiro/extern/Makefile
===================================================================
--- branches/soc-2009-yukishiro/extern/Makefile 2010-03-29 22:19:10 UTC (rev
27843)
+++ branches/soc-2009-yukishiro/extern/Makefile 2010-03-29 22:29:57 UTC (rev
27844)
@@ -32,15 +32,6 @@
DIR = $(OCGDIR)/extern
DIRS = glew/src
-ifeq ($(WITH_FFMPEG), true)
-ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
- DIRS += ffmpeg
-endif
-ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
- DIRS += ffmpeg
-endif
-endif
-
# Cloth requires it
#ifneq ($(NAN_NO_KETSJI), true)
DIRS += bullet2
Modified:
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
===================================================================
---
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
2010-03-29 22:19:10 UTC (rev 27843)
+++
branches/soc-2009-yukishiro/projectfiles_vc9/blender/loader/BLO_loader.vcproj
2010-03-29 22:29:57 UTC (rev 27844)
@@ -470,123 +470,6 @@
</References>
<Files>
<Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
-
RelativePath="..\..\..\source\blender\blenloader\intern\readblenentry.c"
- >
- </File>
- <File
-
RelativePath="..\..\..\source\blender\blenloader\intern\readfile.c"
- >
- <FileConfiguration
- Name="Blender Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
- <File
-
RelativePath="..\..\..\source\blender\blenloader\intern\undofile.c"
- >
- </File>
- <File
-
RelativePath="..\..\..\source\blender\blenloader\intern\writefile.c"
- >
- <FileConfiguration
- Name="Blender Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="3D Plugin Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Blender Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="BlenderPlayer Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
@@ -606,6 +489,123 @@
RelativePath="..\..\..\source\blender\blenloader\BLO_undofile.h"
>
</File>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+
RelativePath="..\..\..\source\blender\blenloader\intern\readblenentry.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\blenloader\intern\readfile.c"
+ >
+ <FileConfiguration
+ Name="Blender Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Blender Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="BlenderPlayer Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="BlenderPlayer
Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\blenloader\intern\undofile.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\blenloader\intern\writefile.c"
+ >
+ <FileConfiguration
+ Name="Blender Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="3D Plugin Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Blender Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="BlenderPlayer Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="BlenderPlayer
Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+
AdditionalIncludeDirectories=""
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
</Filter>
</Files>
<Globals>
Modified: branches/soc-2009-yukishiro/release/io/export_ply.py
===================================================================
--- branches/soc-2009-yukishiro/release/io/export_ply.py 2010-03-29
22:19:10 UTC (rev 27843)
+++ branches/soc-2009-yukishiro/release/io/export_ply.py 2010-03-29
22:29:57 UTC (rev 27844)
@@ -242,7 +242,7 @@
# to the class instance from the operator settings before calling.
__props__ = [
- bpy.props.StringProperty(attr="filename", name="File Name",
description="File name used for exporting the PLY file", maxlen= 1024, default=
""),
+ bpy.props.StringProperty(attr="path", name="File Path",
description="File path used for exporting the PLY file", maxlen= 1024, default=
""),
bpy.props.BoolProperty(attr="use_modifiers", name="Apply
Modifiers", description="Apply Modifiers to the exported mesh", default= True),
bpy.props.BoolProperty(attr="use_normals", name="Export
Normals", description="Export Normals for smooth and hard shaded faces",
default= True),
bpy.props.BoolProperty(attr="use_uvs", name="Export UVs",
description="Exort the active UV layer", default= True),
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
2010-03-29 22:19:10 UTC (rev 27843)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
2010-03-29 22:29:57 UTC (rev 27844)
@@ -56,7 +56,7 @@
if not is_surf:
row = layout.row()
- row.itemR(curve, "curve_2d")
+ row.itemR(curve, "dimensions", expand=True)
split = layout.split()
@@ -64,7 +64,7 @@
if not is_surf:
sub = col.column()
- sub.active = curve.curve_2d
+ sub.active = (curve.dimensions=='2D')
sub.itemL(text="Caps:")
row = sub.row()
row.itemR(curve, "front")
@@ -96,27 +96,29 @@
# col.itemL(text="NORMALS")
# col.itemR(curve, "vertex_normal_flip")
-class DATA_PT_geometry_curve(DataButtonsPanelCurve):
- __label__ = "Geometry "
+class DATA_PT_geometry_curve(DataButtonsPanel):
+ __label__ = "Geometry"
def draw(self, context):
layout = self.layout
curve = context.curve
-
+
split = layout.split()
col = split.column()
col.itemL(text="Modification:")
col.itemR(curve, "width")
col.itemR(curve, "extrude")
- col.itemR(curve, "taper_object", icon='ICON_OUTLINER_OB_CURVE')
+ col.itemL(text="Taper Object:")
+ col.itemR(curve, "taper_object", text="")
col = split.column()
col.itemL(text="Bevel:")
col.itemR(curve, "bevel_depth", text="Depth")
col.itemR(curve, "bevel_resolution", text="Resolution")
- col.itemR(curve, "bevel_object", icon='ICON_OUTLINER_OB_CURVE')
+ col.itemL(text="Bevel Object:")
+ col.itemR(curve, "bevel_object", text="")
class DATA_PT_pathanim(DataButtonsPanelCurve):
@@ -142,6 +144,7 @@
col = split.column()
col.itemR(curve, "use_stretch")
+ col.itemR(curve, "use_radius")
col.itemR(curve, "use_time_offset", text="Offset Children")
class DATA_PT_active_spline(DataButtonsPanelActive):
@@ -207,7 +210,7 @@
if not is_surf:
split = layout.split()
col = split.column()
- col.active = (not curve.curve_2d)
+ col.active = (curve.dimensions=='3D')
col.itemL(text="Interpolation:")
col.itemR(act_spline, "tilt_interpolation",
text="Tilt")
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_text.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_text.py 2010-03-29
22:19:10 UTC (rev 27843)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_text.py 2010-03-29
22:29:57 UTC (rev 27844)
@@ -36,9 +36,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
