[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42427] branches/bmesh/blender: svn merge ^/trunk/blender -r42422:42426
Campbell Barton
ideasman42 at gmail.com
Mon Dec 5 00:39:03 CET 2011
Revision: 42427
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42427
Author: campbellbarton
Date: 2011-12-04 23:39:01 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42422:42426
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42422
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379
/trunk/blender:39992-42422
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379
/trunk/blender:39992-42426
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42422
+ /trunk/blender/release:31524-42426
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2011-12-04 23:13:28 UTC (rev 42426)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2011-12-04 23:39:01 UTC (rev 42427)
@@ -22,7 +22,7 @@
from bpy.types import Operator
-def randomize_selected(seed, delta, loc, rot, scale, scale_even):
+def randomize_selected(seed, delta, loc, rot, scale, scale_even, scale_min):
import random
from random import uniform
@@ -62,20 +62,16 @@
else:
org_sca_x, org_sca_y, org_sca_z = obj.scale
- if scale_even:
- sca_x = sca_y = sca_z = uniform(scale[0], - scale[0])
- uniform(0.0, 0.0), uniform(0.0, 0.0)
- else:
- sca_x, sca_y, sca_z = rand_vec(scale)
+ sca_x, sca_y, sca_z = uniform(-scale[0]+2, scale[0]), uniform(-scale[1]+2, scale[1]), uniform(-scale[2]+2, scale[2])
if scale_even:
- aX = -(sca_x * org_sca_x) + org_sca_x
- aY = -(sca_x * org_sca_y) + org_sca_y
- aZ = -(sca_x * org_sca_z) + org_sca_z
+ aX = sca_x * org_sca_x
+ aY = sca_x * org_sca_y
+ aZ = sca_x * org_sca_z
else:
- aX = sca_x + org_sca_x
- aY = sca_y + org_sca_y
- aZ = sca_z + org_sca_z
+ aX = sca_x * org_sca_x
+ aY = sca_y * org_sca_y
+ aZ = sca_z * org_sca_z
if delta:
obj.delta_scale = aX, aY, aZ
@@ -85,7 +81,7 @@
uniform(0.0, 0.0), uniform(0.0, 0.0), uniform(0.0, 0.0)
-from bpy.props import IntProperty, BoolProperty, FloatVectorProperty
+from bpy.props import IntProperty, BoolProperty, FloatProperty, FloatVectorProperty
class RandomizeLocRotSize(Operator):
@@ -98,7 +94,7 @@
name="Random Seed",
description="Seed value for the random generator",
min=0,
- max=1000,
+ max=10000,
default=0,
)
use_delta = BoolProperty(
@@ -157,7 +153,7 @@
description="Maximum scale randomization over each axis",
min=-100.0,
max=100.0,
- default=(0.0, 0.0, 0.0),
+ default=(1.0, 1.0, 1.0),
subtype='TRANSLATION',
)
@@ -174,7 +170,8 @@
scale_even = self.scale_even
#scale_min = self.scale_min
+ scale_min = 0
- randomize_selected(seed, delta, loc, rot, scale, scale_even)
+ randomize_selected(seed, delta, loc, rot, scale, scale_even, scale_min)
return {'FINISHED'}
Property changes on: branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379
/trunk/blender/source/blender/editors/space_outliner:31524-42422
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379
/trunk/blender/source/blender/editors/space_outliner:31524-42426
More information about the Bf-blender-cvs
mailing list