[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20276] branches/blender2.5/blender: 2.5:
Thomas Dinges
dingto at gmx.de
Tue May 19 17:38:36 CEST 2009
Revision: 20276
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20276
Author: dingto
Date: 2009-05-19 17:38:36 +0200 (Tue, 19 May 2009)
Log Message:
-----------
2.5:
* Added new modifier tab.
* Fixed problems when no object was selected after delete.
* Added initial Armature, Bone, Curve and Font panels, by William Reynish (Billrey). Thanks!
* Small RNA changes
* Commit revision 20240 and 20268 from trunk. ("Mouse wheel zoom lost after rendering.")
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20240
Modified Paths:
--------------
branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/blender2.5/blender/release/ui/buttons_data_modifier.py
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_intern.h
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
Added Paths:
-----------
branches/blender2.5/blender/release/ui/buttons_data_armature.py
branches/blender2.5/blender/release/ui/buttons_data_bone.py
branches/blender2.5/blender/release/ui/buttons_data_curve.py
branches/blender2.5/blender/release/ui/buttons_data_text.py
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-05-19 15:37:50 UTC (rev 20275)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-05-19 15:38:36 UTC (rev 20276)
@@ -39,6 +39,7 @@
#endif
#include "GHOST_SystemWin32.h"
+//#include <stdio.h> //for printf()
// win64 doesn't define GWL_USERDATA
#ifdef WIN32
@@ -536,7 +537,7 @@
LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
GHOST_Event* event = 0;
- LRESULT lResult;
+ LRESULT lResult = 0;
GHOST_SystemWin32* system = ((GHOST_SystemWin32*)getSystem());
GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized")
@@ -746,6 +747,9 @@
* the message is sent asynchronously, so the window is activated immediately.
*/
event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window);
+ /* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL
+ will not be dispatched to OUR active window if we minimize one of OUR windows. */
+ lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);
break;
case WM_PAINT:
/* An application sends the WM_PAINT message when the system or another application
@@ -905,7 +909,6 @@
if (event) {
system->pushEvent(event);
- lResult = 0;
}
else {
lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);
Added: branches/blender2.5/blender/release/ui/buttons_data_armature.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_armature.py (rev 0)
+++ branches/blender2.5/blender/release/ui/buttons_data_armature.py 2009-05-19 15:38:36 UTC (rev 20276)
@@ -0,0 +1,122 @@
+
+import bpy
+
+class DataButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "data"
+
+ def poll(self, context):
+ ob = context.active_object
+ return (ob and ob.type == 'ARMATURE')
+
+class DATA_PT_skeleton(DataButtonsPanel):
+ __idname__ = "DATA_PT_skeleton"
+ __label__ = "Skeleton"
+
+ def draw(self, context):
+ arm = context.main.armatures[0]
+ layout = self.layout
+
+ row = layout.row()
+ row.itemR(arm, "rest_position")
+
+ split = layout.split()
+
+ sub = split.column()
+
+ sub.itemL(text="Deform:")
+ sub.itemR(arm, "deform_vertexgroups", text="Vertes Groups")
+ sub.itemR(arm, "deform_envelope", text="Envelopes")
+ sub.itemR(arm, "deform_quaternion", text="Quaternion")
+ sub.itemR(arm, "deform_bbone_rest", text="B-Bones Rest")
+ #sub.itemR(arm, "x_axis_mirror")
+ #sub.itemR(arm, "auto_ik")
+
+ sub = split.column()
+ sub.itemL(text="Layers:")
+ sub.itemL(text="LAYERS")
+ #sub.itemR(arm, "layer")
+ #sub.itemR(arm, "layer_protection")
+
+
+class DATA_PT_display(DataButtonsPanel):
+ __idname__ = "DATA_PT_display"
+ __label__ = "Display"
+
+ def draw(self, context):
+ arm = context.main.armatures[0]
+ layout = self.layout
+
+ split = layout.split()
+
+ sub = split.column()
+ sub.itemR(arm, "drawtype", text="Style")
+ sub.itemR(arm, "delay_deform", text="Delay Refresh")
+
+ sub = split.column()
+ sub.itemR(arm, "draw_names", text="Names")
+ sub.itemR(arm, "draw_axes", text="Axes")
+ sub.itemR(arm, "draw_custom_bone_shapes", text="Shapes")
+ sub.itemR(arm, "draw_group_colors", text="Colors")
+
+
+class DATA_PT_paths(DataButtonsPanel):
+ __idname__ = "DATA_PT_paths"
+ __label__ = "Paths"
+
+ def draw(self, context):
+ arm = context.main.armatures[0]
+ layout = self.layout
+
+ split = layout.split()
+
+ sub = split.column()
+
+ sub.itemR(arm, "paths_show_around_current_frame", text="Around Frame")
+ if (arm.paths_show_around_current_frame):
+ sub.itemR(arm, "path_before_current", text="Before")
+ sub.itemR(arm, "path_after_current", text="After")
+ else:
+ sub.itemR(arm, "path_start_frame", text="Start")
+ sub.itemR(arm, "path_end_frame", text="End")
+
+ sub.itemR(arm, "path_size", text="Step")
+ sub.itemR(arm, "paths_calculate_head_positions", text="Head")
+
+ sub = split.column()
+ sub.itemL(text="Show:")
+ sub.itemR(arm, "paths_show_frame_numbers", text="Frame Numbers")
+ sub.itemR(arm, "paths_highlight_keyframes", text="Keyframes")
+ sub.itemR(arm, "paths_show_keyframe_numbers", text="Keyframe Numbers")
+
+
+class DATA_PT_ghost(DataButtonsPanel):
+ __idname__ = "DATA_PT_ghost"
+ __label__ = "Ghost"
+
+ def draw(self, context):
+ arm = context.main.armatures[0]
+ layout = self.layout
+
+ split = layout.split()
+
+ sub = split.column()
+
+ sub.itemR(arm, "ghost_type", text="Scope")
+ if arm.ghost_type == 'RANGE':
+ sub.itemR(arm, "ghost_start_frame", text="Start")
+ sub.itemR(arm, "ghost_end_frame", text="End")
+ sub.itemR(arm, "ghost_size", text="Step")
+ elif arm.ghost_type == 'CURRENT_FRAME':
+ sub.itemR(arm, "ghost_step", text="Range")
+ sub.itemR(arm, "ghost_size", text="Step")
+
+ sub = split.column()
+
+ sub.itemR(arm, "ghost_only_selected", text="Selected Only")
+
+bpy.types.register(DATA_PT_skeleton)
+bpy.types.register(DATA_PT_display)
+bpy.types.register(DATA_PT_paths)
+bpy.types.register(DATA_PT_ghost)
\ No newline at end of file
Added: branches/blender2.5/blender/release/ui/buttons_data_bone.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_bone.py (rev 0)
+++ branches/blender2.5/blender/release/ui/buttons_data_bone.py 2009-05-19 15:38:36 UTC (rev 20276)
@@ -0,0 +1,75 @@
+
+import bpy
+
+class DataButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "bone"
+
+ def poll(self, context):
+ ob = context.active_object
+ return (ob and ob.type == 'ARMATURE')
+
+class DATA_PT_bone(DataButtonsPanel):
+ __idname__ = "DATA_PT_bone"
+ __label__ = "Bone"
+
+ def draw(self, context):
+ bone = context.main.armatures[0].bones[0]
+ layout = self.layout
+
+ split = layout.split()
+
+ sub = split.column()
+ sub.itemR(bone, "name")
+ sub.itemR(bone, "parent")
+ sub.itemR(bone, "connected")
+ sub.itemR(bone, "deform")
+
+
+ sub.itemL(text="Inherit:")
+ sub.itemR(bone, "hinge")
+ sub.itemR(bone, "inherit_scale")
+
+ sub.itemL(text="Envelope:")
+ sub.itemR(bone, "envelope_distance", text="Distance")
+ sub.itemR(bone, "envelope_weight", text="Weight")
+ sub.itemR(bone, "multiply_vertexgroup_with_envelope", text="Multiply")
+
+ sub = split.column()
+ #sub.itemR(bone, "layer")
+ sub.itemL(text="Display:")
+ sub.itemR(bone, "draw_wire", text="Wireframe")
+ sub.itemR(bone, "editmode_hidden", text="Hide (EditMode)")
+ sub.itemR(bone, "pose_channel_hidden", text="Hide (PoseMode)")
+
+ sub.itemL(text="Curved Bones:")
+ sub.itemR(bone, "bbone_segments", text="Segments")
+ sub.itemR(bone, "bbone_in", text="Ease In")
+ sub.itemR(bone, "bbone_out", text="Ease Out")
+
+
+ sub.itemR(bone, "cyclic_offset")
+
+
+class DATA_PT_constraints(DataButtonsPanel):
+ __idname__ = "DATA_PT_constraints"
+ __label__ = "Constraints"
+
+ def draw(self, context):
+ bone = context.main.armatures[0].bones[0]
+ layout = self.layout
+
+ split = layout.split()
+
+ sub = split.column()
+
+
+
+
+
+bpy.types.register(DATA_PT_bone)
+bpy.types.register(DATA_PT_constraints)
+
+
+
Added: branches/blender2.5/blender/release/ui/buttons_data_curve.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_curve.py (rev 0)
+++ branches/blender2.5/blender/release/ui/buttons_data_curve.py 2009-05-19 15:38:36 UTC (rev 20276)
@@ -0,0 +1,147 @@
+
+import bpy
+
+class DataButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "data"
+
+ def poll(self, context):
+ ob = context.active_object
+ return (ob and ob.type == 'CURVE')
+
+
+class DATA_PT_shape_curve(DataButtonsPanel):
+ __idname__ = "DATA_PT_shape_curve"
+ __label__ = "Shape"
+
+ def draw(self, context):
+ curve = context.main.curves[0]
+ layout = self.layout
+
+ if not curve:
+ return
+ row = layout.row()
+ row.itemR(curve, "curve_2d")
+
+ split = layout.split()
+
+ sub = split.column()
+ sub.itemL(text="Caps:")
+ sub.itemR(curve, "front")
+ sub.itemR(curve, "back")
+
+ sub.itemL(text="Textures:")
+ sub.itemR(curve, "uv_orco")
+ sub.itemR(curve, "autotexspace")
+
+ sub = split.column()
+ sub.itemL(text="Resolution:")
+ sub.itemR(curve, "resolution_u", text="Preview U")
+ sub.itemR(curve, "resolution_v", text="Preview V")
+ sub.itemR(curve, "render_resolution_u", text="Render U")
+ sub.itemR(curve, "render_resolution_v", text="Render V")
+
+ sub.itemL(text="Display:")
+ sub.itemL(text="HANDLES")
+ sub.itemL(text="NORMALS")
+ sub.itemR(curve, "vertex_normal_flip")
+
+
+class DATA_PT_geometry(DataButtonsPanel):
+ __idname__ = "DATA_PT_geometry"
+ __label__ = "Geometry"
+
+ def draw(self, context):
+ curve = context.main.curves[0]
+ layout = self.layout
+
+ if not curve:
+ return
+
+
+ split = layout.split()
+
+ sub = split.column()
+ sub.itemL(text="Modification:")
+ sub.itemR(curve, "width")
+ sub.itemR(curve, "extrude")
+ sub.itemR(curve, "taper_object")
+ sub = split.column()
+ sub.itemL(text="Bevel:")
+ sub.itemR(curve, "bevel_depth", text="Depth")
+ sub.itemR(curve, "bevel_resolution", text="Resolution")
+ sub.itemR(curve, "bevel_object")
+
+
+
+
+class DATA_PT_pathanim(DataButtonsPanel):
+ __idname__ = "DATA_PT_pathanim"
+ __label__ = "Path Animation"
+
+ def draw(self, context):
+ curve = context.main.curves[0]
+ layout = self.layout
+
+ if not curve:
+ return
+
+
+ split = layout.split()
+ sub = split.column(1)
+ sub.itemR(curve, "path", text="Enable")
+
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list