[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46330] branches/smoke2/release/scripts/ startup: Fix merge error on my part -> Note: Never check the box " ignore spaces"
Daniel Genrich
daniel.genrich at gmx.net
Sat May 5 22:59:25 CEST 2012
Revision: 46330
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46330
Author: genscher
Date: 2012-05-05 20:59:24 +0000 (Sat, 05 May 2012)
Log Message:
-----------
Fix merge error on my part -> Note: Never check the box "ignore spaces"
Modified Paths:
--------------
branches/smoke2/release/scripts/startup/bl_operators/image.py
branches/smoke2/release/scripts/startup/bl_ui/properties_animviz.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_armature.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/smoke2/release/scripts/startup/bl_ui/properties_object.py
branches/smoke2/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/smoke2/release/scripts/startup/bl_ui/space_clip.py
Modified: branches/smoke2/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_operators/image.py 2012-05-05 19:44:35 UTC (rev 46329)
+++ branches/smoke2/release/scripts/startup/bl_operators/image.py 2012-05-05 20:59:24 UTC (rev 46330)
@@ -127,15 +127,15 @@
image.pack(as_png=True)
else:
filepath = bpy.path.abspath(image.filepath, library=image.library)
- if "\\" not in filepath and "/" not in filepath:
- self.report({'WARNING'}, "Invalid path: " + filepath)
- elif filepath in unique_paths:
- self.report({'WARNING'},
- "Path used by more then one image: %r" %
- filepath)
- else:
- unique_paths.add(filepath)
- image.save()
+ if "\\" not in filepath and "/" not in filepath:
+ self.report({'WARNING'}, "Invalid path: " + filepath)
+ elif filepath in unique_paths:
+ self.report({'WARNING'},
+ "Path used by more then one image: %r" %
+ filepath)
+ else:
+ unique_paths.add(filepath)
+ image.save()
return {'FINISHED'}
Modified: branches/smoke2/release/scripts/startup/bl_ui/properties_animviz.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/properties_animviz.py 2012-05-05 19:44:35 UTC (rev 46329)
+++ branches/smoke2/release/scripts/startup/bl_ui/properties_animviz.py 2012-05-05 20:59:24 UTC (rev 46330)
@@ -35,7 +35,7 @@
layout = self.layout
mps = avs.motion_path
-
+
# Display Range
layout.prop(mps, "type", expand=True)
@@ -50,7 +50,7 @@
elif (mps.type == 'RANGE'):
sub.prop(mps, "frame_start", text="Start")
sub.prop(mps, "frame_end", text="End")
-
+
sub.prop(mps, "frame_step", text="Step")
col = split.column()
@@ -58,7 +58,7 @@
col.label(text="Cache for Bone:")
else:
col.label(text="Cache:")
-
+
if mpath:
sub = col.column(align=True)
sub.enabled = False
Modified: branches/smoke2/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/properties_data_armature.py 2012-05-05 19:44:35 UTC (rev 46329)
+++ branches/smoke2/release/scripts/startup/bl_ui/properties_data_armature.py 2012-05-05 20:59:24 UTC (rev 46330)
@@ -309,10 +309,10 @@
ob = context.object
avs = ob.pose.animation_visualisation
-
+
pchan = context.active_pose_bone
mpath = pchan.motion_path if pchan else None
-
+
self.draw_settings(context, avs, mpath, bones=True)
Modified: branches/smoke2/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/properties_data_modifier.py 2012-05-05 19:44:35 UTC (rev 46329)
+++ branches/smoke2/release/scripts/startup/bl_ui/properties_data_modifier.py 2012-05-05 20:59:24 UTC (rev 46330)
@@ -441,11 +441,11 @@
layout.separator()
split = layout.split()
-
+
col = split.column()
col.prop(md, "time")
col.prop(md, "resolution")
-
+
col = split.column()
col.prop(md, "spatial_size")
col.prop(md, "depth")
Modified: branches/smoke2/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/properties_object.py 2012-05-05 19:44:35 UTC (rev 46329)
+++ branches/smoke2/release/scripts/startup/bl_ui/properties_object.py 2012-05-05 20:59:24 UTC (rev 46330)
@@ -301,7 +301,7 @@
ob = context.object
avs = ob.animation_visualisation
mpath = ob.motion_path
-
+
self.draw_settings(context, avs, mpath)
Modified: branches/smoke2/release/scripts/startup/bl_ui/properties_physics_smoke.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/properties_physics_smoke.py 2012-05-05 19:44:35 UTC (rev 46329)
+++ branches/smoke2/release/scripts/startup/bl_ui/properties_physics_smoke.py 2012-05-05 20:59:24 UTC (rev 46330)
@@ -100,7 +100,7 @@
sub.prop(flow, "use_absolute")
sub.prop(flow, "density")
sub.prop(flow, "temperature")
-
+
elif md.smoke_type == 'COLLISION':
coll = md.coll_settings
@@ -108,8 +108,8 @@
col = split.column()
col.prop(coll, "collision_type")
-
+
class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, Panel):
bl_label = "Smoke Groups"
bl_options = {'DEFAULT_CLOSED'}
Modified: branches/smoke2/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/smoke2/release/scripts/startup/bl_ui/space_clip.py 2012-05-05 19:44:35 UTC (rev 46329)
+++ branches/smoke2/release/scripts/startup/bl_ui/space_clip.py 2012-05-05 20:59:24 UTC (rev 46330)
@@ -39,10 +39,10 @@
sub.menu("CLIP_MT_view")
if sc.view == 'CLIP':
- if clip:
- sub.menu("CLIP_MT_select")
+ if clip:
+ sub.menu("CLIP_MT_select")
- sub.menu("CLIP_MT_clip")
+ sub.menu("CLIP_MT_clip")
sub.menu("CLIP_MT_track")
sub.menu("CLIP_MT_reconstruction")
@@ -51,7 +51,7 @@
if clip:
if sc.view == 'CLIP':
- layout.prop(sc, "mode", text="")
+ layout.prop(sc, "mode", text="")
if sc.view == 'GRAPH':
row = layout.row(align=True)
@@ -331,8 +331,8 @@
@classmethod
def poll(cls, context):
if CLIP_PT_reconstruction_panel.poll(context):
- sc = context.space_data
- clip = sc.clip
+ sc = context.space_data
+ clip = sc.clip
tracking_object = clip.tracking.objects.active
@@ -504,9 +504,9 @@
@classmethod
def poll(cls, context):
if CLIP_PT_clip_view_panel.poll(context):
- sc = context.space_data
+ sc = context.space_data
- return sc.mode in {'TRACKING', 'DISTORTION'} and sc.clip
+ return sc.mode in {'TRACKING', 'DISTORTION'} and sc.clip
return False
@@ -782,24 +782,24 @@
sc = context.space_data
if sc.view == 'CLIP':
- layout.operator("clip.properties", icon='MENU_PANEL')
- layout.operator("clip.tools", icon='MENU_PANEL')
- layout.separator()
+ layout.operator("clip.properties", icon='MENU_PANEL')
+ layout.operator("clip.tools", icon='MENU_PANEL')
+ layout.separator()
- layout.operator("clip.view_selected")
- layout.operator("clip.view_all")
+ layout.operator("clip.view_selected")
+ layout.operator("clip.view_all")
- layout.separator()
- layout.operator("clip.view_zoom_in")
- layout.operator("clip.view_zoom_out")
+ layout.separator()
+ layout.operator("clip.view_zoom_in")
+ layout.operator("clip.view_zoom_out")
- layout.separator()
+ layout.separator()
- ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
+ ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
- for a, b in ratios:
- text = "Zoom %d:%d" % (a, b)
- layout.operator("clip.view_zoom_ratio", text=text).ratio = a / b
+ for a, b in ratios:
+ text = "Zoom %d:%d" % (a, b)
+ layout.operator("clip.view_zoom_ratio", text=text).ratio = a / b
else:
layout.prop(sc, "show_seconds")
layout.separator()
More information about the Bf-blender-cvs
mailing list