add advanced panels, fix for properties

This commit is contained in:
Brendon Murphy 2017-06-16 00:19:30 +10:00
parent 16e5546362
commit 554484965a
5 changed files with 18 additions and 18 deletions

View File

@ -100,7 +100,7 @@ class ToolsPanelDelaunay(Panel):
def draw(self, context):
layout = self.layout
adv_obj = context.scene.advanced_objects
adv_obj = context.scene.advanced_objects1
box = layout.box()
col = box.column(align=True)

View File

@ -512,7 +512,7 @@ def writeStokeToSingleMesh(arr, jarr, orig, gs, mct, rpt=None):
def visualizeArray(cg, oob, gs, vm, vs, vc, vv, rst):
winmgr = bpy.context.scene.advanced_objects
winmgr = bpy.context.scene.advanced_objects1
# IN: (cellgrid, origin, gridscale,
# mulimesh, single mesh, cubes, voxels, report sting)
origin = oob.location
@ -1075,7 +1075,7 @@ def getCandidateSites(aList, iList=[]):
# Setup functions
def setupObjects():
winmgr = bpy.context.scene.advanced_objects
winmgr = bpy.context.scene.advanced_objects1
oOB = bpy.data.objects.new('ELorigin', None)
oOB.location = ((0, 0, 10))
bpy.context.scene.objects.link(oOB)
@ -1113,7 +1113,7 @@ def setupObjects():
def checkSettings():
check = True
winmgr = bpy.context.scene.advanced_objects
winmgr = bpy.context.scene.advanced_objects1
message = ""
if winmgr.OOB == "":
message = "Error: no origin object selected"
@ -1141,7 +1141,7 @@ def checkSettings():
# Main
def FSLG():
winmgr = bpy.context.scene.advanced_objects
winmgr = bpy.context.scene.advanced_objects1
# fast simulation of laplacian growth
debug_prints(func="FSLG",
text="Go go gadget: fast simulation of laplacian growth")
@ -1339,7 +1339,7 @@ class OBJECT_PT_fslg(Panel):
def draw(self, context):
layout = self.layout
winmgr = context.scene.advanced_objects
winmgr = context.scene.advanced_objects1
col = layout.column(align=True)
col.prop(winmgr, "TSTEPS")
@ -1382,7 +1382,7 @@ class OBJECT_PT_fslg(Panel):
def getReportString(rtime):
winmgr = bpy.context.scene.advanced_objects
winmgr = bpy.context.scene.advanced_objects1
rSTRING1 = 't:' + str(winmgr.TSTEPS) + ',sc:' + str(winmgr.GSCALE)[0:4] + ',uv:' + str(winmgr.BIGVAR)[0:4] + ','
rSTRING2 = 'ori:' + str(winmgr. ORIGIN[0]) + '/' + str(winmgr. ORIGIN[1]) + '/' + str(winmgr. ORIGIN[2]) + ','
rSTRING3 = 'gz:' + str(winmgr.GROUNDZ) + ',gc:' + str(winmgr.GROUNDC) + ',rtime:' + str(int(rtime))

View File

@ -43,7 +43,7 @@ import bmesh
def move_coordinate(context, co, is_curve=False):
advanced_objects = context.scene.advanced_objects
advanced_objects = context.scene.advanced_objects1
xyz_const = advanced_objects.mangle_constraint_vector
random.seed(time.time())
multiplier = 1
@ -78,7 +78,7 @@ class MeshManglerOperator(Operator):
bm = bmesh.new()
bm.from_mesh(mesh)
verts = bm.verts
advanced_objects = context.scene.advanced_objects
advanced_objects = context.scene.advanced_objects1
randomMag = advanced_objects.mangle_random_magnitude
random.seed(time.time())
@ -116,7 +116,7 @@ class AnimanglerOperator(Operator):
return ob is not None and ob.type in ['MESH', 'CURVE']
def execute(self, context):
scn = context.scene.advanced_objects
scn = context.scene.advanced_objects1
mangleName = scn.mangle_name
ob = context.object
shapeKey = ob.shape_key_add(name=mangleName)
@ -169,7 +169,7 @@ class MangleToolsPanel(Panel):
bl_options = {'DEFAULT_CLOSED'}
def draw(self, context):
scn = context.scene.advanced_objects
scn = context.scene.advanced_objects1
obj = context.object
if obj and obj.type in ['MESH']:

View File

@ -86,7 +86,7 @@ class Oscurart_Constellation(Operator):
return (obj and obj.type == "MESH")
def invoke(self, context, event):
adv_obj = context.scene.advanced_objects
adv_obj = context.scene.advanced_objects1
self.limit = adv_obj.constellation_limit
return self.execute(context)
@ -119,7 +119,7 @@ class Constellation_Operator_Panel(Panel):
def draw(self, context):
layout = self.layout
adv_obj = context.scene.advanced_objects
adv_obj = context.scene.advanced_objects1
box = layout.box()
col = box.column(align=True)

View File

@ -39,7 +39,7 @@ class Set_Up_Fold(Operator):
def execute(self, context):
bpy.ops.object.mode_set()
scn = bpy.context.scene
adv_obj = scn.advanced_objects
adv_obj = scn.advanced_objects1
obj = bpy.context.object
dat = obj.data
fac = dat.polygons
@ -183,7 +183,7 @@ class Animate_Fold(Operator):
def draw(self, context):
layout = self.layout
adv_obj = context.scene.advanced_objects
adv_obj = context.scene.advanced_objects1
if self.is_not_undo is True:
layout.label(text="Warning:", icon="INFO")
@ -200,7 +200,7 @@ class Animate_Fold(Operator):
def invoke(self, context, event):
obj = bpy.context.object
scn = bpy.context.scene
adv_obj = scn.advanced_objects
adv_obj = scn.advanced_objects1
if obj.name != adv_obj.unfold_arm_name:
self.is_not_undo = True
@ -211,7 +211,7 @@ class Animate_Fold(Operator):
def execute(self, context):
obj = bpy.context.object
scn = bpy.context.scene
adv_obj = scn.advanced_objects
adv_obj = scn.advanced_objects1
fra = scn.frame_current
if obj.name != adv_obj.unfold_arm_name:
self.report({"INFO"},
@ -298,7 +298,7 @@ class PanelFOLD(Panel):
def draw(self, context):
layout = self.layout
adv_obj = context.scene.advanced_objects
adv_obj = context.scene.advanced_objects1
box = layout.box()
col = box.column()