diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-08-20 10:09:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-20 10:09:58 +0400 |
| commit | 4f5f868a523430aa41de8bd63f888878aaf63002 (patch) | |
| tree | 2646d7467382bc8d2e5addc361b91f6eec7246e1 | |
| parent | 4afe81c7260905bcb2682d9cbac016a446310955 (diff) | |
rna data path names which are more likely to break animations.
Added an operator "Update Animation Data",
access from the search menu to update drivers and fcurves.
85 files changed, 1793 insertions, 1188 deletions
diff --git a/release/scripts/io/export_fbx.py b/release/scripts/io/export_fbx.py index 54b63ccfa2f..60e9e90e11b 100644 --- a/release/scripts/io/export_fbx.py +++ b/release/scripts/io/export_fbx.py @@ -1082,7 +1082,7 @@ def write(filename, batch_objects = None, \ else: do_shadow = 0 - if light.only_shadow or (not light.diffuse and not light.specular): + if light.use_only_shadow or (not light.diffuse and not light.specular): # if mode & Blender.Lamp.Modes.OnlyShadow or (mode & Blender.Lamp.Modes.NoDiffuse and mode & Blender.Lamp.Modes.NoSpecular): do_light = 0 else: @@ -1190,7 +1190,7 @@ def write(filename, batch_objects = None, \ # mat_spec = mat.spec/2.0 mat_alpha = mat.alpha mat_emit = mat.emit - mat_shadeless = mat.shadeless + mat_shadeless = mat.use_shadeless # mat_shadeless = mat.mode & Blender.Material.Modes.SHADELESS if mat_shadeless: mat_shader = 'Lambert' @@ -1327,9 +1327,9 @@ def write(filename, batch_objects = None, \ Property: "CurrentMappingType", "enum", "",0 Property: "UVSwap", "bool", "",0''') - file.write('\n\t\t\tProperty: "WrapModeU", "enum", "",%i' % tex.clamp_x) + file.write('\n\t\t\tProperty: "WrapModeU", "enum", "",%i' % tex.use_clamp_x) # file.write('\n\t\t\tProperty: "WrapModeU", "enum", "",%i' % tex.clampX) - file.write('\n\t\t\tProperty: "WrapModeV", "enum", "",%i' % tex.clamp_y) + file.write('\n\t\t\tProperty: "WrapModeV", "enum", "",%i' % tex.use_clamp_y) # file.write('\n\t\t\tProperty: "WrapModeV", "enum", "",%i' % tex.clampY) file.write(''' @@ -1605,11 +1605,11 @@ def write(filename, batch_objects = None, \ i=-1 for ed in me.edges: if i==-1: - file.write('%i' % (ed.use_sharp)); i=0 + file.write('%i' % (ed.use_edge_sharp)); i=0 else: if i==54: file.write('\n '); i=0 - file.write(',%i' % (ed.use_sharp)) + file.write(',%i' % (ed.use_edge_sharp)) i+=1 file.write('\n\t\t}') diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 319d459e4c2..53c4a324ed1 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -93,7 +93,7 @@ def write_mtl(scene, filepath, copy_images, mtl_dict): file.write('d %.6f\n' % mat.alpha) # Alpha (obj uses 'd' for dissolve) # 0 to disable lighting, 1 for ambient & diffuse only (specular color set to black), 2 for full lighting. - if mat.shadeless: + if mat.use_shadeless: file.write('illum 0\n') # ignore lighting elif mat.specular_intensity == 0: file.write('illum 1\n') # no specular. diff --git a/release/scripts/io/export_x3d.py b/release/scripts/io/export_x3d.py index 3b396011378..aafb7c922a1 100644 --- a/release/scripts/io/export_x3d.py +++ b/release/scripts/io/export_x3d.py @@ -470,7 +470,7 @@ class x3d_class: if len(maters) >= 1: mat=maters[0] # matFlags = mat.getMode() - if not mat.face_texture: + if not mat.use_face_texture: # if not matFlags & Blender.Material.Modes['TEXFACE']: self.writeMaterial(mat, self.cleanStr(mat.name,''), world) # self.writeMaterial(mat, self.cleanStr(maters[0].name,''), world) @@ -520,7 +520,7 @@ class x3d_class: is_smooth = True break if is_smooth == True: - creaseAngle=(mesh.autosmooth_angle)*(math.pi/180.0) + creaseAngle=(mesh.auto_smooth_angle)*(math.pi/180.0) # creaseAngle=(mesh.degr)*(math.pi/180.0) self.file.write("creaseAngle=\"%s\" " % (round(creaseAngle,self.cp))) @@ -699,7 +699,7 @@ class x3d_class: # specB = (mat.specCol[2]+0.001)/(1.25/(mat.spec+0.001)) transp = 1-mat.alpha # matFlags = mat.getMode() - if mat.shadeless: + if mat.use_shadeless: # if matFlags & Blender.Material.Modes['SHADELESS']: ambient = 1 shine = 1 @@ -731,7 +731,7 @@ class x3d_class: def writeBackground(self, world, alltextures): if world: worldname = world.name else: return - blending = (world.blend_sky, world.paper_sky, world.real_sky) + blending = (world.blend_sky, world.paper_sky, world.use_sky_real) # blending = world.getSkytype() grd = world.horizon_color # grd = world.getHor() diff --git a/release/scripts/io/import_scene_obj.py b/release/scripts/io/import_scene_obj.py index cb56fb62bdc..2b5a3f06832 100644 --- a/release/scripts/io/import_scene_obj.py +++ b/release/scripts/io/import_scene_obj.py @@ -379,7 +379,7 @@ def create_materials(filepath, material_libs, unique_materials, unique_material_ texture.mipmap = True texture.interpolation = True texture.use_alpha = True - blender_material.transparency = True + blender_material.use_transparency = True blender_material.alpha = 0.0 else: blender_material.add_texture(texture, 'UV', 'COLOR') @@ -806,7 +806,7 @@ def create_mesh(new_objects, has_ngons, CREATE_FGONS, CREATE_EDGES, verts_loc, v # for sharp_edge in sharp_edges.keys(): # for ed in me.edges: # if edges_match(sharp_edge, ed.vertices): -# ed.use_sharp = True +# ed.use_edge_sharp = True # if unique_smooth_groups and sharp_edges: # SHARP= Mesh.EdgeFlags.SHARP diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index 42fea338891..6f0f6460ae1 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -146,7 +146,7 @@ def clientSendJob(conn, scene, anim = False): addPointCache(job, object, modifier.point_cache, default_path) elif modifier.type == "SMOKE" and modifier.smoke_type == "TYPE_DOMAIN": addPointCache(job, object, modifier.domain_settings.point_cache_low, default_path) - if modifier.domain_settings.highres: + if modifier.domain_settings.use_high_resolution: addPointCache(job, object, modifier.domain_settings.point_cache_high, default_path) elif modifier.type == "MULTIRES" and modifier.is_external: file_path = bpy.path.abspath(modifier.filepath) @@ -210,7 +210,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine): address = "" if netsettings.server_address == "[default]" else netsettings.server_address - master.runMaster((address, netsettings.server_port), netsettings.master_broadcast, netsettings.master_clear, netsettings.path, self.update_stats, self.test_break) + master.runMaster((address, netsettings.server_port), netsettings.master_broadcast, netsettings.use_master_clear, netsettings.path, self.update_stats, self.test_break) def render_slave(self, scene): diff --git a/release/scripts/io/netrender/repath.py b/release/scripts/io/netrender/repath.py index e7fcad83682..3ac9636b628 100644 --- a/release/scripts/io/netrender/repath.py +++ b/release/scripts/io/netrender/repath.py @@ -121,7 +121,7 @@ def process(paths): processPointCache(modifier.point_cache) elif modifier.type == "SMOKE" and modifier.smoke_type == "TYPE_DOMAIN": processPointCache(modifier.domain_settings.point_cache_low) - if modifier.domain_settings.highres: + if modifier.domain_settings.use_high_resolution: processPointCache(modifier.domain_settings.point_cache_high) elif modifier.type == "MULTIRES" and modifier.is_external: file_path = bpy.path.abspath(modifier.filepath) diff --git a/release/scripts/io/netrender/slave.py b/release/scripts/io/netrender/slave.py index 7528ea1053a..a44309d5634 100644 --- a/release/scripts/io/netrender/slave.py +++ b/release/scripts/io/netrender/slave.py @@ -201,7 +201,7 @@ def render_slave(engine, netsettings, threads): response.read() # Also output on console - if netsettings.slave_outputlog: + if netsettings.use_slave_output_log: print(str(stdout, encoding='utf8'), end="") stdout = bytes() @@ -225,7 +225,7 @@ def render_slave(engine, netsettings, threads): # flush the rest of the logs if stdout: # Also output on console - if netsettings.slave_thumb: + if netsettings.use_slave_thumb: print(str(stdout, encoding='utf8'), end="") # (only need to update on one frame, they are linked @@ -254,7 +254,7 @@ def render_slave(engine, netsettings, threads): filename = os.path.join(JOB_PREFIX, "%06d.exr" % frame.number) # thumbnail first - if netsettings.slave_thumb: + if netsettings.use_slave_thumb: thumbname = thumbnail(filename) f = open(thumbname, 'rb') @@ -294,7 +294,7 @@ def render_slave(engine, netsettings, threads): conn.close() - if netsettings.slave_clear: + if netsettings.use_slave_clear: clearSlave(NODE_PREFIX) if __name__ == "__main__": diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index cacc35ad48d..c2d943f63f8 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -147,9 +147,9 @@ class RENDER_PT_network_slave_settings(bpy.types.Panel, RenderButtonsPanel): rd = scene.render netsettings = scene.network_render - layout.prop(netsettings, "slave_clear") - layout.prop(netsettings, "slave_thumb") - layout.prop(netsettings, "slave_outputlog") + layout.prop(netsettings, "use_slave_clear") + layout.prop(netsettings, "use_slave_thumb") + layout.prop(netsettings, "use_slave_output_log") layout.label(text="Threads:") layout.prop(rd, "threads_mode", expand=True) sub = layout.column() @@ -171,8 +171,8 @@ class RENDER_PT_network_master_settings(bpy.types.Panel, RenderButtonsPanel): scene = context.scene netsettings = scene.network_render - layout.prop(netsettings, "master_broadcast") - layout.prop(netsettings, "master_clear") + layout.prop(netsettings, "use_master_broadcast") + layout.prop(netsettings, "use_master_clear") class RENDER_PT_network_job(bpy.types.Panel, RenderButtonsPanel): bl_label = "Job Settings" @@ -354,27 +354,27 @@ def addProperties(): min=1, max=65535) - NetRenderSettings.BoolProperty( attr="master_broadcast", + NetRenderSettings.BoolProperty( attr="use_master_broadcast", name="Broadcast", description="broadcast master server address on local network", default = True) - NetRenderSettings.BoolProperty( attr="slave_clear", + NetRenderSettings.BoolProperty( attr="use_slave_clear", name="Clear on exit", description="delete downloaded files on exit", default = True) - NetRenderSettings.BoolProperty( attr="slave_thumb", + NetRenderSettings.BoolProperty( attr="use_slave_thumb", name="Generate thumbnails", description="Generate thumbnails on slaves instead of master", default = False) - NetRenderSettings.BoolProperty( attr="slave_outputlog", + NetRenderSettings.BoolProperty( attr="use_slave_output_log", name="Output render log on console", description="Output render text log to console as well as sending it to the master", default = True) - NetRenderSettings.BoolProperty( attr="master_clear", + NetRenderSettings.BoolProperty( attr="use_master_clear", name="Clear on exit", description="delete saved files on exit", default = False) diff --git a/release/scripts/modules/animsys_refactor.py b/release/scripts/modules/animsys_refactor.py index 3959904e0c5..8cc91873b0e 100644 --- a/release/scripts/modules/animsys_refactor.py +++ b/release/scripts/modules/animsys_refactor.py @@ -42,7 +42,7 @@ class DataPathBuilder(object): str_value = '["%s"]' % key return DataPathBuilder(self.data_path + (str_value, )) - def resolve(self, real_base): + def resolve(self, real_base, rna_update_from_map=None): """ Return (attribute, value) pairs. """ pairs = [] @@ -50,10 +50,24 @@ class DataPathBuilder(object): for item in self.data_path: if base is not Ellipsis: try: + # this only works when running with an old blender + # where the old path will resolve base = eval("base" + item) except: - print("Failed to resolve data path:", self.data_path) - base = Ellipsis + base_new = Ellipsis + # guess the new name + if item.startswith("."): + for item_new in rna_update_from_map.get(item[1:], ()): + try: + print("base." + item_new) + base_new = eval("base." + item_new) + break # found, dont keep looking + except: + pass + + if base_new is Ellipsis: + print("Failed to resolve data path:", self.data_path) + base = base_new pairs.append((item, base)) return pairs @@ -96,14 +110,14 @@ def classes_recursive(base_type, clss=None): return clss -def find_path_new(id_data, data_path, rna_update_dict): +def find_path_new(id_data, data_path, rna_update_dict, rna_update_from_map): # ignore ID props for now if data_path.startswith("["): return data_path # recursive path fixing, likely will be one in most cases. data_path_builder = eval("DataPathBuilder(tuple())." + data_path) - data_resolve = data_path_builder.resolve(id_data) + data_resolve = data_path_builder.resolve(id_data, rna_update_from_map) path_new = [pair[0] for pair in data_resolve] @@ -136,6 +150,10 @@ def update_data_paths(rna_update): rna_update_dict = {} for ren_class, ren_from, ren_to in rna_update: rna_update_dict.setdefault(ren_class, {})[ren_from] = ren_to + + rna_update_from_map = {} + for ren_class, ren_from, ren_to in rna_update: + rna_update_from_map.setdefault(ren_from, []).append(ren_to) for id_data in id_iter(): anim_data = getattr(id_data, "animation_data", None) @@ -150,7 +168,7 @@ def update_data_paths(rna_update): data_path = tar.data_path if id_data_other and data_path: - data_path_new = find_path_new(id_data_other, data_path, rna_update_dict) + data_path_new = find_path_new(id_data_other, data_path, rna_update_dict, rna_update_from_map) # print(data_path_new) if data_path_new != data_path: if not IS_TESTING: @@ -162,22 +180,22 @@ def update_data_paths(rna_update): for action in anim_data_actions(anim_data): for fcu in action.fcurves: data_path = fcu.data_path - data_path_new = find_path_new(id_data, data_path, rna_update_dict) + data_path_new = find_path_new(id_data, data_path, rna_update_dict, rna_update_from_map) # print(data_path_new) if data_path_new != data_path: if not IS_TESTING: fcu.data_path = data_path_new print("fcurve (%s): %s -> %s" % (id_data.name, data_path, data_path_new)) - + if __name__ == "__main__": # Example, should be called externally # (class, from, to) replace_ls = [ - ('AnimVizMotionPaths', 'after_current', 'frame_after'), - ('AnimVizMotionPaths', 'before_current', 'frame_before'), - ('AnimVizOnionSkinning', 'after_current', 'frame_after'), + ('AnimVizMotionPaths', 'frame_after', 'frame_after'), + ('AnimVizMotionPaths', 'frame_before', 'frame_before'), + ('AnimVizOnionSkinning', 'frame_after', 'frame_after'), ] update_data_paths(replace_ls) diff --git a/release/scripts/modules/bpy/__init__.py b/release/scripts/modules/bpy/__init__.py index 3431054413e..5b7d5a76336 100644 --- a/release/scripts/modules/bpy/__init__.py +++ b/release/scripts/modules/bpy/__init__.py @@ -48,7 +48,7 @@ def _main(): import pydoc pydoc.getpager = lambda: pydoc.plainpager pydoc.Helper.getline = lambda self, prompt: None - pydoc.TextDoc.bold = lambda self, text: text + pydoc.TextDoc.use_bold = lambda self, text: text # if "-d" in sys.argv: # Enable this to measure startup speed diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py index 2eed5bbb74e..98d9bb235a2 100644 --- a/release/scripts/modules/rigify/__init__.py +++ b/release/scripts/modules/rigify/__init__.py @@ -548,7 +548,7 @@ def generate_test_all(context, GRAPH=False): i = 0 for obj, obj_new in new_objects: - obj.data.drawtype = 'STICK' + obj.data.draw_type = 'STICK' obj.location[1] += i obj_new.location[1] += i obj_new.select = False diff --git a/release/scripts/modules/rigify/arm_biped.py b/release/scripts/modules/rigify/arm_biped.py index ec36210e61d..ac878c3c076 100644 --- a/release/scripts/modules/rigify/arm_biped.py +++ b/release/scripts/modules/rigify/arm_biped.py @@ -161,7 +161,7 @@ def ik(obj, definitions, base_names, options): con.use_stretch = True con.use_target = True con.use_rotation = False - con.chain_length = 2 + con.chain_count = 2 con.pole_angle = -pi/2 # last step setup layers diff --git a/release/scripts/modules/rigify/eye_balls.py b/release/scripts/modules/rigify/eye_balls.py index b1889d7c36f..f65d56b9f2b 100644 --- a/release/scripts/modules/rigify/eye_balls.py +++ b/release/scripts/modules/rigify/eye_balls.py @@ -328,8 +328,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_X' con.frame_start = -20 con.frame_end = 20 - con.minimum = 0.0 - con.maximum = 2.0 + con.min = 0.0 + con.max = 2.0 con.target_space = 'LOCAL' diff --git a/release/scripts/modules/rigify/eye_lid.py b/release/scripts/modules/rigify/eye_lid.py index 2d7e3e0e61f..3f336e268c6 100644 --- a/release/scripts/modules/rigify/eye_lid.py +++ b/release/scripts/modules/rigify/eye_lid.py @@ -436,8 +436,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance*2 - con.maximum = distance + con.min = -distance*2 + con.max = distance con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -455,8 +455,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance*2 - con.maximum = distance + con.min = -distance*2 + con.max = distance con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -473,8 +473,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance*2 - con.maximum = distance + con.min = -distance*2 + con.max = distance con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -491,8 +491,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance*2 - con.maximum = distance + con.min = -distance*2 + con.max = distance con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -509,8 +509,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance*2 - con.maximum = distance + con.min = -distance*2 + con.max = distance con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -528,8 +528,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance - con.maximum = distance*2 + con.min = -distance + con.max = distance*2 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -546,8 +546,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance - con.maximum = distance*2 + con.min = -distance + con.max = distance*2 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -564,8 +564,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance - con.maximum = distance*2 + con.min = -distance + con.max = distance*2 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -582,8 +582,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance - con.maximum = distance*2 + con.min = -distance + con.max = distance*2 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -600,8 +600,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'LOCATION_Y' con.frame_start = -30 con.frame_end = 30 - con.minimum = -distance - con.maximum = distance*2 + con.min = -distance + con.max = distance*2 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver diff --git a/release/scripts/modules/rigify/leg_biped.py b/release/scripts/modules/rigify/leg_biped.py index 2ea70402d36..d2ddba9f549 100644 --- a/release/scripts/modules/rigify/leg_biped.py +++ b/release/scripts/modules/rigify/leg_biped.py @@ -225,7 +225,7 @@ def ik(obj, bone_definition, base_names, options): # IK con = ik_chain.shin_p.constraints.new('IK') - con.chain_length = 2 + con.chain_count = 2 con.iterations = 500 con.pole_angle = -pi / 2.0 con.use_tail = True @@ -256,11 +256,11 @@ def ik(obj, bone_definition, base_names, options): con.owner_space = 'LOCAL' if con_l is cons[-1][-1]: - con.minimum_x = 0.0 - con.maximum_x = 180.0 # XXX -deg + con.min_x = 0.0 + con.max_x = 180.0 # XXX -deg else: - con.minimum_x = -180.0 # XXX -deg - con.maximum_x = 0.0 + con.min_x = -180.0 # XXX -deg + con.max_x = 0.0 # last step setup layers diff --git a/release/scripts/modules/rigify/leg_quadruped.py b/release/scripts/modules/rigify/leg_quadruped.py index 640e1766ca6..739a6402c4b 100644 --- a/release/scripts/modules/rigify/leg_quadruped.py +++ b/release/scripts/modules/rigify/leg_quadruped.py @@ -268,7 +268,7 @@ def ik(obj, bone_definition, base_names, options): # IK con = ik_chain.shin_p.constraints.new('IK') - con.chain_length = 2 + con.chain_count = 2 con.iterations = 500 con.pole_angle = -90.0 # XXX - in deg! con.use_tail = True diff --git a/release/scripts/modules/rigify/mouth.py b/release/scripts/modules/rigify/mouth.py index fff58861e02..ce232b91e7b 100644 --- a/release/scripts/modules/rigify/mouth.py +++ b/release/scripts/modules/rigify/mouth.py @@ -458,7 +458,7 @@ def control(obj, definitions, base_names, options): con.target = obj con.subtarget = jaw con.head_tail = 1.0 - con.original_length = bb[jopent].length + con.rest_length = bb[jopent].length con.volume = 'NO_VOLUME' # Head lips to jaw lips @@ -545,8 +545,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -563,8 +563,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -581,8 +581,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -599,8 +599,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -617,8 +617,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -635,8 +635,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -653,8 +653,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver @@ -671,8 +671,8 @@ def control(obj, definitions, base_names, options): con.transform_channel = 'SCALE_Y' con.frame_start = 0 con.frame_end = 60 - con.minimum = 0.0 - con.maximum = 1.0 + con.min = 0.0 + con.max = 1.0 con.target_space = 'LOCAL' fcurve = con.driver_add("influence") driver = fcurve.driver diff --git a/release/scripts/modules/rigify/stretch.py b/release/scripts/modules/rigify/stretch.py index 67ceeb39954..6a498e5aa29 100644 --- a/release/scripts/modules/rigify/stretch.py +++ b/release/scripts/modules/rigify/stretch.py @@ -100,7 +100,7 @@ def main(obj, bone_definition, base_names, options): con = pb[bone].constraints.new('STRETCH_TO') con.target = obj con.subtarget = mbone2 - con.original_length = bb[bone].length + con.rest_length = bb[bone].length if preserve_volume: con.volume = 'VOLUME_XZX' else: diff --git a/release/scripts/modules/rigify/stretch_twist.py b/release/scripts/modules/rigify/stretch_twist.py index 5250c5a9735..07ce031967f 100644 --- a/release/scripts/modules/rigify/stretch_twist.py +++ b/release/scripts/modules/rigify/stretch_twist.py @@ -128,7 +128,7 @@ def main(obj, bone_definition, base_names, options): con = pb[bone1].constraints.new('STRETCH_TO') con.target = obj con.subtarget = mid_bone - con.original_length = bb[bone1].length + con.rest_length = bb[bone1].length if preserve_volume: con.volume = 'VOLUME_XZX' else: @@ -142,7 +142,7 @@ def main(obj, bone_definition, base_names, options): con = pb[bone2].constraints.new('STRETCH_TO') con.target = obj con.subtarget = mid_bone - con.original_length = bb[bone2].length + con.rest_length = bb[bone2].length if preserve_volume: con.volume = 'VOLUME_XZX' else: diff --git a/release/scripts/modules/rigify_utils.py b/release/scripts/modules/rigify_utils.py index 39481b37f59..a270af949da 100644 --- a/release/scripts/modules/rigify_utils.py +++ b/release/scripts/modules/rigify_utils.py @@ -67,7 +67,7 @@ def add_stretch_to(obj, from_name, to_name, name): con = stretch_pbone.constraints.new('STRETCH_TO') con.target = obj con.subtarget = to_name - con.original_length = (head - tail).length + con.rest_length = (head - tail).length con.keep_axis = 'PLANE_X' con.volume = 'NO_VOLUME' diff --git a/release/scripts/op/animsys_update.py b/release/scripts/op/animsys_update.py new file mode 100644 index 00000000000..0350eeef6b8 --- /dev/null +++ b/release/scripts/op/animsys_update.py @@ -0,0 +1,580 @@ +# ##### BEGIN GPL LICENSE BLOCK ##### +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# ##### END GPL LICENSE BLOCK ##### + +# <pep8 compliant> + +data_path_update = [ + ("AnimVizMotionPaths", "after_current", "frame_after"), + ("AnimVizMotionPaths", "before_current", "frame_before"), + ("AnimVizOnionSkinning", "after_current", "frame_after"), + ("AnimVizOnionSkinning", "before_current", "frame_before"), + ("ClothCollisionSettings", "min_distance", "distance_min"), + ("ClothCollisionSettings", "self_min_distance", "self_distance_min"), + ("ClothCollisionSettings", "enable_collision", "use_collision"), + ("ClothCollisionSettings", "enable_self_collision", "use_self_collision"), + ("ClothSettings", "pin_cloth", "use_pin_cloth"), + ("ClothSettings", "stiffness_scaling", "use_stiffness_scale"), + ("CollisionSettings", "random_damping", "damping_random"), + ("CollisionSettings", "random_friction", "friction_random"), + ("CollisionSettings", "inner_thickness", "thickness_inner"), + ("CollisionSettings", "outer_thickness", "thickness_outer"), + ("CollisionSettings", "kill_particles", "use_particle_kill"), + ("Constraint", "proxy_local", "is_proxy_local"), + ("ActionConstraint", "maximum", "max"), + ("ActionConstraint", "minimum", "min"), + ("FollowPathConstraint", "use_fixed_position", "use_fixed_location"), + ("KinematicConstraint", "chain_length", "chain_count"), + ("KinematicConstraint", "pos_lock_x", "lock_location_x"), + ("KinematicConstraint", "pos_lock_y", "lock_location_y"), + ("KinematicConstraint", "pos_lock_z", "lock_location_z"), + ("KinematicConstraint", "rot_lock_x", "lock_rotation_x"), + ("KinematicConstraint", "rot_lock_y", "lock_rotation_y"), + ("KinematicConstraint", "rot_lock_z", "lock_rotation_z"), + ("KinematicConstraint", "axis_reference", "reference_axis"), + ("KinematicConstraint", "use_position", "use_location"), + ("LimitLocationConstraint", "maximum_x", "max_x"), + ("LimitLocationConstraint", "maximum_y", "max_y"), + ("LimitLocationConstraint", "maximum_z", "max_z"), + ("LimitLocationConstraint", "minimum_x", "min_x"), + ("LimitLocationConstraint", "minimum_y", "min_y"), + ("LimitLocationConstraint", "minimum_z", "min_z"), + ("LimitLocationConstraint", "use_maximum_x", "use_max_x"), + ("LimitLocationConstraint", "use_maximum_y", "use_max_y"), + ("LimitLocationConstraint", "use_maximum_z", "use_max_z"), + ("LimitLocationConstraint", "use_minimum_x", "use_min_x"), + ("LimitLocationConstraint", "use_minimum_y", "use_min_y"), + ("LimitLocationConstraint", "use_minimum_z", "use_min_z"), + ("LimitLocationConstraint", "limit_transform", "use_transform_limit"), + ("LimitRotationConstraint", "maximum_x", "max_x"), + ("LimitRotationConstraint", "maximum_y", "max_y"), + ("LimitRotationConstraint", "maximum_z", "max_z"), + ("LimitRotationConstraint", "minimum_x", "min_x"), + ("LimitRotationConstraint", "minimum_y", "min_y"), + ("LimitRotationConstraint", "minimum_z", "min_z"), + ("LimitRotationConstraint", "limit_transform", "use_transform_limit"), + ("LimitScaleConstraint", "maximum_x", "max_x"), + ("LimitScaleConstraint", "maximum_y", "max_y"), + ("LimitScaleConstraint", "maximum_z", "max_z"), + ("LimitScaleConstraint", "minimum_x", "min_x"), + ("LimitScaleConstraint", "minimum_y", "min_y"), + ("LimitScaleConstraint", "minimum_z", "min_z"), + ("LimitScaleConstraint", "use_maximum_x", "use_max_x"), + ("LimitScaleConstraint", "use_maximum_y", "use_max_y"), + ("LimitScaleConstraint", "use_maximum_z", "use_max_z"), + ("LimitScaleConstraint", "use_minimum_x", "use_min_x"), + ("LimitScaleConstraint", "use_minimum_y", "use_min_y"), + ("LimitScaleConstraint", "use_minimum_z", "use_min_z"), + ("LimitScaleConstraint", "limit_transform", "use_transform_limit"), + ("PivotConstraint", "enabled_rotation_range", "rotation_range"), + ("PivotConstraint", "use_relative_position", "use_relative_location"), + ("PythonConstraint", "number_of_targets", "target_count"), + ("SplineIKConstraint", "chain_length", "chain_count"), + ("SplineIKConstraint", "chain_offset", "use_chain_offset"), + ("SplineIKConstraint", "even_divisions", "use_even_divisions"), + ("SplineIKConstraint", "y_stretch", "use_y_stretch"), + ("SplineIKConstraint", "xz_scaling_mode", "xz_scale_mode"), + ("StretchToConstraint", "original_length", "rest_length"), + ("TrackToConstraint", "target_z", "use_target_z"), + ("TransformConstraint", "extrapolate_motion", "use_motion_extrapolate"), + ("FieldSettings", "do_location", "apply_to_location"), + ("FieldSettings", "do_rotation", "apply_to_rotation"), + ("FieldSettings", "maximum_distance", "distance_max"), + ("FieldSettings", "minimum_distance", "distance_min"), + ("FieldSettings", "radial_maximum", "radial_max"), + ("FieldSettings", "radial_minimum", "radial_min"), + ("FieldSettings", "force_2d", "use_2d_force"), + ("FieldSettings", "do_absorption", "use_absorption"), + ("FieldSettings", "global_coordinates", "use_global_coords"), + ("FieldSettings", "guide_path_add", "use_guide_path_add"), + ("FieldSettings", "multiple_springs", "use_multiple_springs"), + ("FieldSettings", "use_coordinates", "use_object_coords"), + ("FieldSettings", "root_coordinates", "use_root_coords"), + ("ControlFluidSettings", "reverse_frames", "use_reverse_frames"), + ("DomainFluidSettings", "real_world_size", "simulation_scale"), + ("DomainFluidSettings", "surface_smoothing", "surface_smooth"), + ("DomainFluidSettings", "reverse_frames", "use_reverse_frames"), + ("DomainFluidSettings", "generate_speed_vectors", "use_speed_vectors"), + ("DomainFluidSettings", "override_time", "use_time_override"), + ("FluidFluidSettings", "export_animated_mesh", "use_animated_mesh"), + ("InflowFluidSettings", "export_animated_mesh", "use_animated_mesh"), + ("InflowFluidSettings", "local_coordinates", "use_local_coords"), + ("ObstacleFluidSettings", "export_animated_mesh", "use_animated_mesh"), + ("OutflowFluidSettings", "export_animated_mesh", "use_animated_mesh"), + ("ParticleFluidSettings", "drops", "use_drops"), + ("ParticleFluidSettings", "floats", "use_floats"), + ("GameSoftBodySettings", "linstiff", "linear_stiffness"), + ("GameSoftBodySettings", "position_iterations", "location_iterations"), + ("GameSoftBodySettings", "bending_const", "use_bending_constraints"), + ("GameSoftBodySettings", "cluster_rigid_to_softbody", "use_cluster_rigid_to_softbody"), + ("GameSoftBodySettings", "cluster_soft_to_softbody", "use_cluster_soft_to_softbody"), + ("GameSoftBodySettings", "shape_match", "use_shape_match"), + ("NetRenderSettings", "master_broadcast", "use_master_broadcast"), + ("NetRenderSettings", "master_clear", "use_master_clear"), + ("NetRenderSettings", "slave_clear", "use_slave_clear"), + ("NetRenderSettings", "slave_outputlog", "use_slave_output_log"), + ("NetRenderSettings", "slave_thumb", "use_slave_thumb"), + ("PoseTemplateSettings", "generate_def_rig", "use_generate_deform_rig"), + ("Armature", "drawtype", "draw_type"), + ("Armature", "layer_protection", "layers_protected"), + ("Armature", "auto_ik", "use_auto_ik"), + ("Armature", "delay_deform", "use_deform_delay"), + ("Armature", "deform_envelope", "use_deform_envelopes"), + ("Armature", "deform_quaternion", "use_deform_preserve_volume"), + ("Armature", "deform_vertexgroups", "use_deform_vertex_groups"), + ("Armature", "x_axis_mirror", "use_mirror_x"), + ("Curve", "width", "offset"), + ("Image", "animation_speed", "fps"), + ("Image", "animation_end", "frame_end"), + ("Image", "animation_start", "frame_start"), + ("Image", "animated", "use_animation"), + ("Image", "clamp_x", "use_clamp_x"), + ("Image", "clamp_y", "use_clamp_y"), + ("Image", "premultiply", "use_premultiply"), + ("AreaLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"), + ("AreaLamp", "only_shadow", "use_only_shadow"), + ("AreaLamp", "shadow_layer", "use_shadow_layer"), + ("AreaLamp", "umbra", "use_umbra"), + ("PointLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"), + ("PointLamp", "only_shadow", "use_only_shadow"), + ("PointLamp", "shadow_layer", "use_shadow_layer"), + ("PointLamp", "sphere", "use_sphere"), + ("SpotLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"), + ("SpotLamp", "auto_clip_end", "use_auto_clip_end"), + ("SpotLamp", "auto_clip_start", "use_auto_clip_start"), + ("SpotLamp", "only_shadow", "use_only_shadow"), + ("SpotLamp", "shadow_layer", "use_shadow_layer"), + ("SpotLamp", "sphere", "use_sphere"), + ("SunLamp", "only_shadow", "use_only_shadow"), + ("SunLamp", "shadow_layer", "use_shadow_layer"), + ("Material", "z_offset", "offset_z"), + ("Material", "shadow_casting_alpha", "shadow_cast_alpha"), + ("Material", "cast_approximate", "use_cast_approximate"), + ("Material", "cast_buffer_shadows", "use_cast_buffer_shadows"), + ("Material", "cast_shadows_only", "use_cast_shadows_only"), + ("Material", "face_texture", "use_face_texture"), + ("Material", "face_texture_alpha", "use_face_texture_alpha"), + ("Material", "full_oversampling", "use_full_oversampling"), + ("Material", "light_group_exclusive", "use_light_group_exclusive"), + ("Material", "object_color", "use_object_color"), + ("Material", "only_shadow", "use_only_shadow"), + ("Material", "ray_shadow_bias", "use_ray_shadow_bias"), + ("Material", "traceable", "use_raytrace"), + ("Material", "shadeless", "use_shadeless"), + ("Material", "tangent_shading", "use_tangent_shading"), + ("Material", "transparency", "use_transparency"), + ("Material", "receive_transparent_shadows", "use_transparent_shadows"), + ("Material", "vertex_color_light", "use_vertex_color_light"), + ("Material", "vertex_color_paint", "use_vertex_color_paint"), + ("Mesh", "autosmooth_angle", "auto_smooth_angle"), + ("Mesh", "autosmooth", "use_auto_smooth"), + ("Object", "max_draw_type", "draw_type"), + ("Object", "use_dupli_verts_rotation", "use_dupli_vertices_rotation"), + ("Object", "shape_key_edit_mode", "use_shape_key_edit_mode"), + ("Object", "slow_parent", "use_slow_parent"), + ("Object", "time_offset_add_parent", "use_time_offset_add_parent"), + ("Object", "time_offset_edit", "use_time_offset_edit"), + ("Object", "time_offset_parent", "use_time_offset_parent"), + ("Object", "time_offset_particle", "use_time_offset_particle"), + ("ParticleSettings", "adaptive_pix", "adaptive_pixel"), + ("ParticleSettings", "child_effector", "apply_effector_to_children"), + ("ParticleSettings", "child_guide", "apply_guide_to_children"), + ("ParticleSettings", "billboard_split_offset", "billboard_offset_split"), + ("ParticleSettings", "billboard_random_tilt", "billboard_tilt_random"), + ("ParticleSettings", "child_length_thres", "child_length_threshold"), + ("ParticleSettings", "child_random_size", "child_size_random"), + ("ParticleSettings", "clumppow", "clump_shape"), + ("ParticleSettings", "damp_factor", "damping"), + ("ParticleSettings", "draw_as", "draw_method"), + ("ParticleSettings", "random_factor", "factor_random"), + ("ParticleSettings", "grid_invert", "invert_grid"), + ("ParticleSettings", "random_length", "length_random"), + ("ParticleSettings", "random_lifetime", "lifetime_random"), + ("ParticleSettings", "billboard_lock", "lock_billboard"), + ("ParticleSettings", "boids_2d", "lock_boids_to_surface"), + ("ParticleSettings", "object_aligned_factor", "object_align_factor"), + ("ParticleSettings", "random_phase_factor", "phase_factor_random"), + ("ParticleSettings", "ren_as", "render_type"), + ("ParticleSettings", "rendered_child_nbr", "rendered_child_count"), + ("ParticleSettings", "random_rotation_factor", "rotation_factor_random"), + ("ParticleSettings", "rough1", "roughness_1"), + ("ParticleSettings", "rough1_size", "roughness_1_size"), + ("ParticleSettings", "rough2", "roughness_2"), + ("ParticleSettings", "rough2_size", "roughness_2_size"), + ("ParticleSettings", "rough2_thres", "roughness_2_threshold"), + ("ParticleSettings", "rough_end_shape", "roughness_end_shape"), + ("ParticleSettings", "rough_endpoint", "roughness_endpoint"), + ("ParticleSettings", "random_size", "size_random"), + ("ParticleSettings", "abs_path_time", "use_absolute_path_time"), + ("ParticleSettings", "animate_branching", "use_animate_branching"), + ("ParticleSettings", "branching", "use_branching"), + ("ParticleSettings", "died", "use_dead"), + ("ParticleSettings", "die_on_collision", "use_die_on_collision"), + ("ParticleSettings", "rotation_dynamic", "use_dynamic_rotation"), + ("ParticleSettings", "even_distribution", "use_even_distribution"), + ("ParticleSettings", "rand_group", "use_group_pick_random"), + ("ParticleSettings", "hair_bspline", "use_hair_bspline"), + ("ParticleSettings", "sizemass", "use_multiply_size_mass"), + ("ParticleSettings", "react_multiple", "use_react_multiple"), + ("ParticleSettings", "react_start_end", "use_react_start_end"), + ("ParticleSettings", "render_adaptive", "use_render_adaptive"), + ("ParticleSettings", "self_effect", "use_self_effect"), + ("ParticleSettings", "enable_simplify", "use_simplify"), + ("ParticleSettings", "size_deflect", "use_size_deflect"), + ("ParticleSettings", "render_strand", "use_strand_primitive"), + ("ParticleSettings", "symmetric_branching", "use_symmetric_branching"), + ("ParticleSettings", "velocity_length", "use_velocity_length"), + ("ParticleSettings", "whole_group", "use_whole_group"), + ("CloudsTexture", "noise_size", "noise_scale"), + ("DistortedNoiseTexture", "noise_size", "noise_scale"), + ("EnvironmentMapTexture", "filter_size_minimum", "use_filter_size_min"), + ("EnvironmentMapTexture", "mipmap_gauss", "use_mipmap_gauss"), + ("ImageTexture", "calculate_alpha", "use_calculate_alpha"), + ("ImageTexture", "checker_even", "use_checker_even"), + ("ImageTexture", "checker_odd", "use_checker_odd"), + ("ImageTexture", "filter_size_minimum", "use_filter_size_min"), + ("ImageTexture", "flip_axis", "use_flip_axis"), + ("ImageTexture", "mipmap_gauss", "use_mipmap_gauss"), + ("ImageTexture", "mirror_x", "use_mirror_x"), + ("ImageTexture", "mirror_y", "use_mirror_y"), + ("ImageTexture", "normal_map", "use_normal_map"), + ("MarbleTexture", "noise_size", "noise_scale"), + ("MarbleTexture", "noisebasis2", "noisebasis_2"), + ("MusgraveTexture", "highest_dimension", "dimension_max"), + ("MusgraveTexture", "noise_size", "noise_scale"), + ("StucciTexture", "noise_size", "noise_scale"), + ("VoronoiTexture", "coloring", "color_mode"), + ("VoronoiTexture", "noise_size", "noise_scale"), + ("WoodTexture", "noise_size", "noise_scale"), + ("WoodTexture", "noisebasis2", "noisebasis_2"), + ("World", "blend_sky", "use_sky_blend"), + ("World", "paper_sky", "use_sky_paper"), + ("World", "real_sky", "use_sky_real"), + ("ImageUser", "auto_refresh", "use_auto_refresh"), + ("MaterialHalo", "flares_sub", "flare_subflare_count"), + ("MaterialHalo", "flare_subsize", "flare_subflare_size"), + ("MaterialHalo", "line_number", "line_count"), + ("MaterialHalo", "rings", "ring_count"), + ("MaterialHalo", "star_tips", "star_tip_count"), + ("MaterialHalo", "xalpha", "use_extreme_alpha"), + ("MaterialHalo", "flare_mode", "use_flare_mode"), + ("MaterialHalo", "vertex_normal", "use_vertex_normal"), + ("MaterialPhysics", "align_to_normal", "use_normal_align"), + ("MaterialStrand", "min_size", "size_min"), + ("MaterialStrand", "blender_units", "use_blender_units"), + ("MaterialStrand", "surface_diffuse", "use_surface_diffuse"), + ("MaterialStrand", "tangent_shading", "use_tangent_shading"), + ("MaterialSubsurfaceScattering", "error_tolerance", "error_threshold"), + ("MaterialVolume", "depth_cutoff", "depth_threshold"), + ("MaterialVolume", "lighting_mode", "light_method"), + ("MaterialVolume", "step_calculation", "step_method"), + ("MaterialVolume", "external_shadows", "use_external_shadows"), + ("MaterialVolume", "light_cache", "use_light_cache"), + ("ArmatureModifier", "multi_modifier", "use_multi_modifier"), + ("ArrayModifier", "constant_offset_displacement", "constant_offset_displace"), + ("ArrayModifier", "merge_distance", "merge_threshold"), + ("ArrayModifier", "relative_offset_displacement", "relative_offset_displace"), + ("ArrayModifier", "constant_offset", "use_constant_offset"), + ("ArrayModifier", "merge_adjacent_vertices", "use_merge_vertices"), + ("ArrayModifier", "merge_end_vertices", "use_merge_vertices_cap"), + ("ArrayModifier", "add_offset_object", "use_object_offset"), + ("ArrayModifier", "relative_offset", "use_relative_offset"), + ("BevelModifier", "only_vertices", "use_only_vertices"), + ("CastModifier", "from_radius", "use_radius_as_size"), + ("DisplaceModifier", "midlevel", "mid_level"), + ("DisplaceModifier", "texture_coordinates", "texture_coords"), + ("EdgeSplitModifier", "use_sharp", "use_edge_sharp"), + ("ExplodeModifier", "split_edges", "use_edge_split"), + ("MirrorModifier", "merge_limit", "merge_threshold"), + ("MirrorModifier", "mirror_u", "use_mirror_u"), + ("MirrorModifier", "mirror_v", "use_mirror_v"), + ("MirrorModifier", "mirror_vertex_groups", "use_mirror_vertex_groups"), + ("ParticleInstanceModifier", "particle_system_number", "particle_system_index"), + ("ParticleInstanceModifier", "keep_shape", "use_preserve_shape"), + ("ShrinkwrapModifier", "cull_back_faces", "use_cull_back_faces"), + ("ShrinkwrapModifier", "cull_front_faces", "use_cull_front_faces"), + ("ShrinkwrapModifier", "keep_above_surface", "use_keep_above_surface"), + ("SimpleDeformModifier", "lock_x_axis", "lock_x"), + ("SimpleDeformModifier", "lock_y_axis", "lock_y"), + ("SmokeModifier", "smoke_type", "type"), + ("SubsurfModifier", "subsurf_uv", "use_subsurf_uv"), + ("UVProjectModifier", "num_projectors", "projector_count"), + ("UVProjectModifier", "override_image", "use_image_override"), + ("WaveModifier", "texture_coordinates", "texture_coords"), + ("WaveModifier", "x_normal", "use_normal_x"), + ("WaveModifier", "y_normal", "use_normal_y"), + ("WaveModifier", "z_normal", "use_normal_z"), + ("NlaStrip", "blending", "blend_type"), + ("NlaStrip", "animated_influence", "use_animated_influence"), + ("NlaStrip", "animated_time", "use_animated_time"), + ("NlaStrip", "animated_time_cyclic", "use_animated_time_cyclic"), + ("NlaStrip", "auto_blending", "use_auto_blend"), + ("CompositorNodeAlphaOver", "convert_premul", "use_premultiply"), + ("CompositorNodeBlur", "sizex", "size_x"), + ("CompositorNodeBlur", "sizey", "size_y"), + ("CompositorNodeChannelMatte", "algorithm", "limit_method"), + ("CompositorNodeChromaMatte", "acceptance", "tolerance"), + ("CompositorNodeColorBalance", "correction_formula", "correction_method"), + ("CompositorNodeColorSpill", "algorithm", "limit_method"), + ("CompositorNodeColorSpill", "unspill", "use_unspill"), + ("CompositorNodeCrop", "x2", "max_x"), + ("CompositorNodeCrop", "y2", "max_y"), + ("CompositorNodeCrop", "x1", "min_x"), + ("CompositorNodeCrop", "y1", "min_y"), + ("CompositorNodeCrop", "crop_size", "use_crop_size"), + ("CompositorNodeDefocus", "max_blur", "blur_max"), + ("CompositorNodeDefocus", "gamma_correction", "use_gamma_correction"), + ("CompositorNodeGlare", "rotate_45", "use_rotate_45"), + ("CompositorNodeImage", "auto_refresh", "use_auto_refresh"), + ("CompositorNodeLensdist", "projector", "use_projector"), + ("CompositorNodeVecBlur", "max_speed", "speed_max"), + ("CompositorNodeVecBlur", "min_speed", "speed_min"), + ("ShaderNodeMapping", "maximum", "max"), + ("ShaderNodeMapping", "minimum", "min"), + ("ShaderNodeMapping", "clamp_maximum", "use_max"), + ("ShaderNodeMapping", "clamp_minimum", "use_min"), + ("VertexPaint", "all_faces", "use_all_faces"), + ("VertexPaint", "spray", "use_spray"), + ("ParticleEdit", "add_keys", "default_key_count"), + ("ParticleEdit", "selection_mode", "select_mode"), + ("ParticleEdit", "auto_velocity", "use_auto_velocity"), + ("ParticleEdit", "add_interpolate", "use_default_interpolate"), + ("ParticleEdit", "emitter_deflect", "use_emitter_deflect"), + ("ParticleEdit", "fade_time", "use_fade_time"), + ("ParticleEdit", "keep_lengths", "use_preserve_length"), + ("ParticleEdit", "keep_root", "use_preserve_root"), + ("ParticleSystem", "vertex_group_clump_negate", "invert_vertex_group_clump"), + ("ParticleSystem", "vertex_group_density_negate", "invert_vertex_group_density"), + ("ParticleSystem", "vertex_group_field_negate", "invert_vertex_group_field"), + ("ParticleSystem", "vertex_group_kink_negate", "invert_vertex_group_kink"), + ("ParticleSystem", "vertex_group_length_negate", "invert_vertex_group_length"), + ("ParticleSystem", "vertex_group_rotation_negate", "invert_vertex_group_rotation"), + ("ParticleSystem", "vertex_group_roughness1_negate", "invert_vertex_group_roughness_1"), + ("ParticleSystem", "vertex_group_roughness2_negate", "invert_vertex_group_roughness_2"), + ("ParticleSystem", "vertex_group_roughness_end_negate", "invert_vertex_group_roughness_end"), + ("ParticleSystem", "vertex_group_size_negate", "invert_vertex_group_size"), + ("ParticleSystem", "vertex_group_tangent_negate", "invert_vertex_group_tangent"), + ("ParticleSystem", "vertex_group_velocity_negate", "invert_vertex_group_velocity"), + ("ParticleSystem", "hair_dynamics", "use_hair_dynamics"), + ("ParticleSystem", "keyed_timing", "use_keyed_timing"), + ("PointDensity", "falloff_softness", "falloff_soft"), + ("PointDensity", "particle_cache", "particle_cache_space"), + ("PointDensity", "turbulence_size", "turbulence_scale"), + ("PointDensity", "turbulence", "use_turbulence"), + ("PointDensity", "vertices_cache", "vertex_cache_space"), + ("PoseBone", "ik_lin_weight", "ik_linear_weight"), + ("PoseBone", "ik_rot_weight", "ik_rotation_weight"), + ("PoseBone", "ik_limit_x", "use_ik_limit_x"), + ("PoseBone", "ik_limit_y", "use_ik_limit_y"), + ("PoseBone", "ik_limit_z", "use_ik_limit_z"), + ("PoseBone", "ik_lin_control", "use_ik_linear_control"), + ("PoseBone", "ik_rot_control", "use_ik_rotation_control"), + ("SPHFluidSettings", "spring_k", "spring_force"), + ("SPHFluidSettings", "stiffness_k", "stiffness"), + ("SPHFluidSettings", "stiffness_knear", "stiffness_near"), + ("SceneGameData", "framing_color", "frame_color"), + ("SceneGameData", "framing_type", "frame_type"), + ("SceneGameData", "eye_separation", "stereo_eye_separation"), + ("SceneGameData", "activity_culling", "use_activity_culling"), + ("SceneGameData", "auto_start", "use_auto_start"), + ("SceneGameData", "glsl_extra_textures", "use_glsl_extra_textures"), + ("SceneGameData", "glsl_lights", "use_glsl_lights"), + ("SceneGameData", "glsl_nodes", "use_glsl_nodes"), + ("SceneGameData", "glsl_ramps", "use_glsl_ramps"), + ("SceneGameData", "glsl_shaders", "use_glsl_shaders"), + ("SceneGameData", "glsl_shadows", "use_glsl_shadows"), + ("Sequence", "blend_opacity", "blend_alpha"), + ("Sequence", "blend_mode", "blend_type"), + ("Sequence", "frame_final_length", "frame_final_duration"), + ("Sequence", "use_effect_default_fade", "use_default_fade"), + ("SequenceColorBalance", "inverse_gain", "invert_gain"), + ("SequenceColorBalance", "inverse_gamma", "invert_gamma"), + ("SequenceColorBalance", "inverse_lift", "invert_lift"), + ("EffectSequence", "multiply_colors", "color_multiply"), + ("EffectSequence", "de_interlace", "use_deinterlace"), + ("EffectSequence", "flip_x", "use_flip_x"), + ("EffectSequence", "flip_y", "use_flip_y"), + ("EffectSequence", "convert_float", "use_float"), + ("EffectSequence", "premultiply", "use_premultiply"), + ("EffectSequence", "proxy_custom_directory", "use_proxy_custom_directory"), + ("EffectSequence", "proxy_custom_file", "use_proxy_custom_file"), + ("EffectSequence", "reverse_frames", "use_reverse_frames"), + ("GlowSequence", "blur_distance", "blur_radius"), + ("GlowSequence", "only_boost", "use_only_boost"), + ("SpeedControlSequence", "curve_compress_y", "use_curve_compress_y"), + ("SpeedControlSequence", "curve_velocity", "use_curve_velocity"), + ("SpeedControlSequence", "frame_blending", "use_frame_blend"), + ("TransformSequence", "uniform_scale", "use_uniform_scale"), + ("ImageSequence", "animation_end_offset", "animation_offset_end"), + ("ImageSequence", "animation_start_offset", "animation_offset_start"), + ("ImageSequence", "multiply_colors", "color_multiply"), + ("ImageSequence", "de_interlace", "use_deinterlace"), + ("ImageSequence", "flip_x", "use_flip_x"), + ("ImageSequence", "flip_y", "use_flip_y"), + ("ImageSequence", "convert_float", "use_float"), + ("ImageSequence", "premultiply", "use_premultiply"), + ("ImageSequence", "proxy_custom_directory", "use_proxy_custom_directory"), + ("ImageSequence", "proxy_custom_file", "use_proxy_custom_file"), + ("ImageSequence", "reverse_frames", "use_reverse_frames"), + ("MetaSequence", "animation_end_offset", "animation_offset_end"), + ("MetaSequence", "animation_start_offset", "animation_offset_start"), + ("MetaSequence", "multiply_colors", "color_multiply"), + ("MetaSequence", "de_interlace", "use_deinterlace"), + ("MetaSequence", "flip_x", "use_flip_x"), + ("MetaSequence", "flip_y", "use_flip_y"), + ("MetaSequence", "convert_float", "use_float"), + ("MetaSequence", "premultiply", "use_premultiply"), + ("MetaSequence", "proxy_custom_directory", "use_proxy_custom_directory"), + ("MetaSequence", "proxy_custom_file", "use_proxy_custom_file"), + ("MetaSequence", "reverse_frames", "use_reverse_frames"), + ("MovieSequence", "animation_end_offset", "animation_offset_end"), + ("MovieSequence", "animation_start_offset", "animation_offset_start"), + ("MovieSequence", "multiply_colors", "color_multiply"), + ("MovieSequence", "de_interlace", "use_deinterlace"), + ("MovieSequence", "flip_x", "use_flip_x"), + ("MovieSequence", "flip_y", "use_flip_y"), + ("MovieSequence", "convert_float", "use_float"), + ("MovieSequence", "premultiply", "use_premultiply"), + ("MovieSequence", "proxy_custom_directory", "use_proxy_custom_directory"), + ("MovieSequence", "proxy_custom_file", "use_proxy_custom_file"), + ("MovieSequence", "reverse_frames", "use_reverse_frames"), + ("MulticamSequence", "animation_end_offset", "animation_offset_end"), + ("MulticamSequence", "animation_start_offset", "animation_offset_start"), + ("MulticamSequence", "multiply_colors", "color_multiply"), + ("MulticamSequence", "de_interlace", "use_deinterlace"), + ("MulticamSequence", "flip_x", "use_flip_x"), + ("MulticamSequence", "flip_y", "use_flip_y"), + ("MulticamSequence", "convert_float", "use_float"), + ("MulticamSequence", "premultiply", "use_premultiply"), + ("MulticamSequence", "proxy_custom_directory", "use_proxy_custom_directory"), + ("MulticamSequence", "proxy_custom_file", "use_proxy_custom_file"), + ("MulticamSequence", "reverse_frames", "use_reverse_frames"), + ("SceneSequence", "animation_end_offset", "animation_offset_end"), + ("SceneSequence", "animation_start_offset", "animation_offset_start"), + ("SceneSequence", "multiply_colors", "color_multiply"), + ("SceneSequence", "de_interlace", "use_deinterlace"), + ("SceneSequence", "flip_x", "use_flip_x"), + ("SceneSequence", "flip_y", "use_flip_y"), + ("SceneSequence", "convert_float", "use_float"), + ("SceneSequence", "premultiply", "use_premultiply"), + ("SceneSequence", "proxy_custom_directory", "use_proxy_custom_directory"), + ("SceneSequence", "proxy_custom_file", "use_proxy_custom_file"), + ("SceneSequence", "reverse_frames", "use_reverse_frames"), + ("SoundSequence", "animation_end_offset", "animation_offset_end"), + ("SoundSequence", "animation_start_offset", "animation_offset_start"), + ("SmokeDomainSettings", "smoke_domain_colli", "collision_extents"), + ("SmokeDomainSettings", "smoke_cache_high_comp", "point_cache_compress_high_type"), + ("SmokeDomainSettings", "smoke_cache_comp", "point_cache_compress_type"), + ("SmokeDomainSettings", "maxres", "resolution_max"), + ("SmokeDomainSettings", "smoothemitter", "smooth_emitter"), + ("SmokeDomainSettings", "dissolve_smoke", "use_dissolve_smoke"), + ("SmokeDomainSettings", "dissolve_smoke_log", "use_dissolve_smoke_log"), + ("SmokeDomainSettings", "highres", "use_high_resolution"), + ("SoftBodySettings", "bending", "bend"), + ("SoftBodySettings", "error_limit", "error_threshold"), + ("SoftBodySettings", "lcom", "location_mass_center"), + ("SoftBodySettings", "lrot", "rotation_estimate"), + ("SoftBodySettings", "lscale", "scale_estimate"), + ("SoftBodySettings", "maxstep", "step_max"), + ("SoftBodySettings", "minstep", "step_min"), + ("SoftBodySettings", "diagnose", "use_diagnose"), + ("SoftBodySettings", "edge_collision", "use_edge_collision"), + ("SoftBodySettings", "estimate_matrix", "use_estimate_matrix"), + ("SoftBodySettings", "face_collision", "use_face_collision"), + ("SoftBodySettings", "self_collision", "use_self_collision"), + ("SoftBodySettings", "stiff_quads", "use_stiff_quads"), + ("TexMapping", "maximum", "max"), + ("TexMapping", "minimum", "min"), + ("TexMapping", "has_maximum", "use_max"), + ("TexMapping", "has_minimum", "use_min"), + ("TextCharacterFormat", "bold", "use_bold"), + ("TextCharacterFormat", "italic", "use_italic"), + ("TextCharacterFormat", "underline", "use_underline"), + ("TextureSlot", "rgb_to_intensity", "use_rgb_to_intensity"), + ("TextureSlot", "stencil", "use_stencil"), + ("LampTextureSlot", "texture_coordinates", "texture_coords"), + ("LampTextureSlot", "map_color", "use_map_color"), + ("LampTextureSlot", "map_shadow", "use_map_shadow"), + ("MaterialTextureSlot", "coloremission_factor", "color_emission_factor"), + ("MaterialTextureSlot", "colordiff_factor", "diffuse_color_factor"), + ("MaterialTextureSlot", "x_mapping", "mapping_x"), + ("MaterialTextureSlot", "y_mapping", "mapping_y"), + ("MaterialTextureSlot", "z_mapping", "mapping_z"), + ("MaterialTextureSlot", "colorreflection_factor", "reflection_color_factor"), + ("MaterialTextureSlot", "colorspec_factor", "specular_color_factor"), + ("MaterialTextureSlot", "texture_coordinates", "texture_coords"), + ("MaterialTextureSlot", "colortransmission_factor", "transmission_color_factor"), + ("MaterialTextureSlot", "from_dupli", "use_from_dupli"), + ("MaterialTextureSlot", "from_original", "use_from_original"), + ("MaterialTextureSlot", "map_alpha", "use_map_alpha"), + ("MaterialTextureSlot", "map_ambient", "use_map_ambient"), + ("MaterialTextureSlot", "map_colordiff", "use_map_color_diff"), + ("MaterialTextureSlot", "map_coloremission", "use_map_color_emission"), + ("MaterialTextureSlot", "map_colorreflection", "use_map_color_reflection"), + ("MaterialTextureSlot", "map_colorspec", "use_map_color_spec"), + ("MaterialTextureSlot", "map_colortransmission", "use_map_color_transmission"), + ("MaterialTextureSlot", "map_density", "use_map_density"), + ("MaterialTextureSlot", "map_diffuse", "use_map_diffuse"), + ("MaterialTextureSlot", "map_displacement", "use_map_displacement"), + ("MaterialTextureSlot", "map_emission", "use_map_emission"), + ("MaterialTextureSlot", "map_emit", "use_map_emit"), + ("MaterialTextureSlot", "map_hardness", "use_map_hardness"), + ("MaterialTextureSlot", "map_mirror", "use_map_mirror"), + ("MaterialTextureSlot", "map_normal", "use_map_normal"), + ("MaterialTextureSlot", "map_raymir", "use_map_raymir"), + ("MaterialTextureSlot", "map_reflection", "use_map_reflect"), + ("MaterialTextureSlot", "map_scattering", "use_map_scatter"), + ("MaterialTextureSlot", "map_specular", "use_map_specular"), + ("MaterialTextureSlot", "map_translucency", "use_map_translucency"), + ("MaterialTextureSlot", "map_warp", "use_map_warp"), + ("WorldTextureSlot", "texture_coordinates", "texture_coords"), + ("WorldTextureSlot", "map_blend", "use_map_blend"), + ("WorldTextureSlot", "map_horizon", "use_map_horizon"), + ("WorldTextureSlot", "map_zenith_down", "use_map_zenith_down"), + ("WorldTextureSlot", "map_zenith_up", "use_map_zenith_up"), + ("VoxelData", "still_frame_number", "still_frame"), + ("WorldLighting", "ao_blend_mode", "ao_blend_type"), + ("WorldLighting", "error_tolerance", "error_threshold"), + ("WorldLighting", "use_ambient_occlusion", "use_ambient_occlusian"), + ("WorldLighting", "pixel_cache", "use_cache"), + ("WorldLighting", "use_environment_lighting", "use_environment_light"), + ("WorldLighting", "use_indirect_lighting", "use_indirect_light"), + ("WorldStarsSettings", "color_randomization", "color_random"), + ("WorldStarsSettings", "min_distance", "distance_min"), + ] + + +import bpy + + +class UpdateAnimData(bpy.types.Operator): + '''''' + bl_idname = "anim.update_data_paths" + bl_label = "Update Animation Data" + + def execute(self, context): + import animsys_refactor + reload(animsys_refactor) + animsys_refactor.update_data_paths(data_path_update) + return {'FINISHED'} + + +if __name__ == "__main__": + bpy.ops.anim.update_data_paths() + +def register(): + pass
\ No newline at end of file diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index be68a7f1609..43e2cda5d53 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -125,7 +125,7 @@ class AddPresetSSS(AddPresetBase, bpy.types.Operator): "bpy.context.material.subsurface_scattering.color[1]", "bpy.context.material.subsurface_scattering.color[2]", "bpy.context.material.subsurface_scattering.color_factor", - "bpy.context.material.subsurface_scattering.error_tolerance", + "bpy.context.material.subsurface_scattering.error_threshold", "bpy.context.material.subsurface_scattering.front", "bpy.context.material.subsurface_scattering.ior", "bpy.context.material.subsurface_scattering.radius[0]", diff --git a/release/scripts/op/sequencer.py b/release/scripts/op/sequencer.py index cbb7d00e659..feedb5cb4a8 100644 --- a/release/scripts/op/sequencer.py +++ b/release/scripts/op/sequencer.py @@ -129,7 +129,7 @@ class SequencerDeinterlaceSelectedMovies(bpy.types.Operator): def execute(self, context): for s in context.scene.sequence_editor.sequences_all: if s.select and s.type == 'MOVIE': - s.de_interlace = True + s.use_deinterlace = True return {'FINISHED'} diff --git a/release/scripts/ui/properties_animviz.py b/release/scripts/ui/properties_animviz.py index bbd849e4daf..9b605d02215 100644 --- a/release/scripts/ui/properties_animviz.py +++ b/release/scripts/ui/properties_animviz.py @@ -41,8 +41,8 @@ class MotionPathButtonsPanel(): col = split.column() sub = col.column(align=True) if (mps.type == 'CURRENT_FRAME'): - sub.prop(mps, "before_current", text="Before") - sub.prop(mps, "after_current", text="After") + sub.prop(mps, "frame_before", text="Before") + sub.prop(mps, "frame_after", text="After") elif (mps.type == 'RANGE'): sub.prop(mps, "frame_start", text="Start") sub.prop(mps, "frame_end", text="End") diff --git a/release/scripts/ui/properties_data_armature.py b/release/scripts/ui/properties_data_armature.py index 767b163d3c2..7de06554751 100644 --- a/release/scripts/ui/properties_data_armature.py +++ b/release/scripts/ui/properties_data_armature.py @@ -67,18 +67,18 @@ class DATA_PT_skeleton(ArmatureButtonsPanel, bpy.types.Panel): col.label(text="Layers:") col.prop(arm, "layers", text="") col.label(text="Protected Layers:") - col.prop(arm, "layer_protection", text="") + col.prop(arm, "layers_protected", text="") col.label(text="Deform:") split = layout.split() col = split.column() - col.prop(arm, "deform_vertexgroups", text="Vertex Groups") - col.prop(arm, "deform_envelope", text="Envelopes") + col.prop(arm, "use_deform_vertex_groups", text="Vertex Groups") + col.prop(arm, "use_deform_envelopes", text="Envelopes") col = split.column() - col.prop(arm, "deform_quaternion", text="Quaternion") + col.prop(arm, "use_deform_preserve_volume", text="Quaternion") class DATA_PT_display(ArmatureButtonsPanel, bpy.types.Panel): @@ -90,7 +90,7 @@ class DATA_PT_display(ArmatureButtonsPanel, bpy.types.Panel): ob = context.object arm = context.armature - layout.row().prop(arm, "drawtype", expand=True) + layout.row().prop(arm, "draw_type", expand=True) split = layout.split() @@ -102,7 +102,7 @@ class DATA_PT_display(ArmatureButtonsPanel, bpy.types.Panel): col = split.column() col.prop(arm, "show_group_colors", text="Colors") col.prop(ob, "show_x_ray", text="X-Ray") - col.prop(arm, "delay_deform", text="Delay Refresh") + col.prop(arm, "use_deform_delay", text="Delay Refresh") class DATA_PT_bone_groups(ArmatureButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_data_armature_rigify.py b/release/scripts/ui/properties_data_armature_rigify.py index 0dbd964acb5..1c2370cbb28 100644 --- a/release/scripts/ui/properties_data_armature_rigify.py +++ b/release/scripts/ui/properties_data_armature_rigify.py @@ -84,7 +84,7 @@ class DATA_PT_template(bpy.types.Panel): row.operator("pose.metarig_validate", text="Check") row.operator("pose.metarig_graph", text="Graph") row = layout.row() - row.prop(pose_templates, "generate_def_rig") + row.prop(pose_templates, "use_generate_deform_rig") row = layout.row() col = row.column() @@ -151,7 +151,7 @@ class Generate(bpy.types.Operator): import rigify reload(rigify) - meta_def = context.scene.pose_templates.generate_def_rig + meta_def = context.scene.pose_templates.use_generate_deform_rig try: rigify.generate_rig(context, context.object, META_DEF=meta_def) @@ -329,7 +329,7 @@ def register(): min=-1, max=65535) - PoseTemplateSettings.BoolProperty(attr="generate_def_rig", + PoseTemplateSettings.BoolProperty(attr="use_generate_deform_rig", name="Create Deform Rig", description="Create a copy of the metarig, constrainted by the generated rig", default=False) diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py index 4c0f8a3e52c..663d576a9c0 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -233,12 +233,12 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.25) sub = split.row() - sub.prop(pchan, "ik_limit_x", text="Limit") + sub.prop(pchan, "use_ik_limit_x", text="Limit") sub.active = pchan.lock_ik_x == False and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_x", text="") sub.prop(pchan, "ik_max_x", text="") - sub.active = pchan.lock_ik_x == False and pchan.ik_limit_x and pchan.is_in_ik_chain + sub.active = pchan.lock_ik_x == False and pchan.use_ik_limit_x and pchan.is_in_ik_chain split = layout.split(percentage=0.25) split.prop(pchan, "lock_ik_y", text="Y") @@ -250,13 +250,13 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.25) sub = split.row() - sub.prop(pchan, "ik_limit_y", text="Limit") + sub.prop(pchan, "use_ik_limit_y", text="Limit") sub.active = pchan.lock_ik_y == False and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_y", text="") sub.prop(pchan, "ik_max_y", text="") - sub.active = pchan.lock_ik_y == False and pchan.ik_limit_y and pchan.is_in_ik_chain + sub.active = pchan.lock_ik_y == False and pchan.use_ik_limit_y and pchan.is_in_ik_chain split = layout.split(percentage=0.25) split.prop(pchan, "lock_ik_z", text="Z") @@ -268,12 +268,12 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.25) sub = split.row() - sub.prop(pchan, "ik_limit_z", text="Limit") + sub.prop(pchan, "use_ik_limit_z", text="Limit") sub.active = pchan.lock_ik_z == False and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_z", text="") sub.prop(pchan, "ik_max_z", text="") - sub.active = pchan.lock_ik_z == False and pchan.ik_limit_z and pchan.is_in_ik_chain + sub.active = pchan.lock_ik_z == False and pchan.use_ik_limit_z and pchan.is_in_ik_chain split = layout.split() split.prop(pchan, "ik_stretch", text="Stretch", slider=True) split.label() @@ -282,15 +282,15 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): if ob.pose.ik_solver == 'ITASC': split = layout.split() col = split.column() - col.prop(pchan, "ik_rot_control", text="Control Rotation") + col.prop(pchan, "use_ik_rotation_control", text="Control Rotation") col.active = pchan.is_in_ik_chain col = split.column() - col.prop(pchan, "ik_rot_weight", text="Weight", slider=True) + col.prop(pchan, "ik_rotation_weight", text="Weight", slider=True) col.active = pchan.is_in_ik_chain # not supported yet #row = layout.row() - #row.prop(pchan, "ik_lin_control", text="Joint Size") - #row.prop(pchan, "ik_lin_weight", text="Weight", slider=True) + #row.prop(pchan, "use_ik_linear_control", text="Joint Size") + #row.prop(pchan, "ik_linear_weight", text="Weight", slider=True) class BONE_PT_deform(BoneButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py index cd62746c3ab..3008db11b36 100644 --- a/release/scripts/ui/properties_data_curve.py +++ b/release/scripts/ui/properties_data_curve.py @@ -140,7 +140,7 @@ class DATA_PT_geometry_curve(CurveButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Modification:") - col.prop(curve, "width") + col.prop(curve, "offset") col.prop(curve, "extrude") col.label(text="Taper Object:") col.prop(curve, "taper_object", text="") @@ -299,9 +299,9 @@ class DATA_PT_font(CurveButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Character:") - col.prop(char, "bold") - col.prop(char, "italic") - col.prop(char, "underline") + col.prop(char, "use_bold") + col.prop(char, "use_italic") + col.prop(char, "use_underline") split = layout.split() col = split.column() diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/ui/properties_data_lamp.py index 8eb0c275462..8d82f5ef943 100644 --- a/release/scripts/ui/properties_data_lamp.py +++ b/release/scripts/ui/properties_data_lamp.py @@ -99,7 +99,7 @@ class DATA_PT_lamp(DataButtonsPanel, bpy.types.Panel): sub.prop(lamp, "linear_attenuation", slider=True, text="Linear") sub.prop(lamp, "quadratic_attenuation", slider=True, text="Quadratic") - col.prop(lamp, "sphere") + col.prop(lamp, "use_sphere") if lamp.type == 'AREA': col.prop(lamp, "distance") @@ -221,8 +221,8 @@ class DATA_PT_shadow(DataButtonsPanel, bpy.types.Panel): col.prop(lamp, "shadow_color", text="") col = split.column() - col.prop(lamp, "shadow_layer", text="This Layer Only") - col.prop(lamp, "only_shadow") + col.prop(lamp, "use_shadow_layer", text="This Layer Only") + col.prop(lamp, "use_only_shadow") if lamp.shadow_method == 'RAY_SHADOW': split = layout.split() @@ -245,19 +245,19 @@ class DATA_PT_shadow(DataButtonsPanel, bpy.types.Panel): sub.prop(lamp, "shadow_ray_samples_x", text="Samples X") sub.prop(lamp, "shadow_ray_samples_y", text="Samples Y") - col.row().prop(lamp, "shadow_ray_sampling_method", expand=True) + col.row().prop(lamp, "shadow_ray_sample_method", expand=True) split = layout.split() col = split.column() - if lamp.shadow_ray_sampling_method == 'ADAPTIVE_QMC': + if lamp.shadow_ray_sample_method == 'ADAPTIVE_QMC': col.prop(lamp, "shadow_adaptive_threshold", text="Threshold") col = split.column() - if lamp.type == 'AREA' and lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED': + if lamp.type == 'AREA' and lamp.shadow_ray_sample_method == 'CONSTANT_JITTERED': col = split.column() col = split.column() - col.prop(lamp, "umbra") + col.prop(lamp, "use_umbra") col.prop(lamp, "dither") col.prop(lamp, "jitter") @@ -291,15 +291,15 @@ class DATA_PT_shadow(DataButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(lamp, "auto_clip_start", text="Autoclip Start") + col.prop(lamp, "use_auto_clip_start", text="Autoclip Start") sub = col.column() - sub.active = not lamp.auto_clip_start + sub.active = not lamp.use_auto_clip_start sub.prop(lamp, "shadow_buffer_clip_start", text="Clip Start") col = split.column() - col.prop(lamp, "auto_clip_end", text="Autoclip End") + col.prop(lamp, "use_auto_clip_end", text="Autoclip End") sub = col.column() - sub.active = not lamp.auto_clip_end + sub.active = not lamp.use_auto_clip_end sub.prop(lamp, "shadow_buffer_clip_end", text=" Clip End") diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index 1188de7f11c..aaf814ed705 100644 --- a/release/scripts/ui/properties_data_mesh.py +++ b/release/scripts/ui/properties_data_mesh.py @@ -91,10 +91,10 @@ class DATA_PT_normals(MeshButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(mesh, "autosmooth") + col.prop(mesh, "use_auto_smooth") sub = col.column() - sub.active = mesh.autosmooth - sub.prop(mesh, "autosmooth_angle", text="Angle") + sub.active = mesh.use_auto_smooth + sub.prop(mesh, "auto_smooth_angle", text="Angle") col = split.column() @@ -183,7 +183,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): enable_edit_value = False if ob.show_shape_key is False: - if enable_edit or (ob.type == 'MESH' and ob.shape_key_edit_mode): + if enable_edit or (ob.type == 'MESH' and ob.use_shape_key_edit_mode): enable_edit_value = True row = layout.row() @@ -220,7 +220,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): subsub.active = enable_edit_value subsub.prop(ob, "show_shape_key", text="") subsub.prop(kb, "mute", text="") - sub.prop(ob, "shape_key_edit_mode", text="") + sub.prop(ob, "use_shape_key_edit_mode", text="") sub = row.row() sub.operator("object.shape_key_clear", icon='X', text="") diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 26080951fff..e08c7cb1f23 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -70,7 +70,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Deformation:") col.prop(md, "quaternion") - col.prop(md, "multi_modifier") + col.prop(md, "use_multi_modifier") def ARRAY(self, layout, ob, md): layout.prop(md, "fit_type") @@ -87,30 +87,30 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(md, "constant_offset") + col.prop(md, "use_constant_offset") sub = col.column() - sub.active = md.constant_offset - sub.prop(md, "constant_offset_displacement", text="") + sub.active = md.use_constant_offset + sub.prop(md, "constant_offset_displace", text="") col.separator() - col.prop(md, "merge_adjacent_vertices", text="Merge") + col.prop(md, "use_merge_vertices", text="Merge") sub = col.column() - sub.active = md.merge_adjacent_vertices - sub.prop(md, "merge_end_vertices", text="First Last") - sub.prop(md, "merge_distance", text="Distance") + sub.active = md.use_merge_vertices + sub.prop(md, "use_merge_vertices_cap", text="First Last") + sub.prop(md, "merge_threshold", text="Distance") col = split.column() - col.prop(md, "relative_offset") + col.prop(md, "use_relative_offset") sub = col.column() - sub.active = md.relative_offset - sub.prop(md, "relative_offset_displacement", text="") + sub.active = md.use_relative_offset + sub.prop(md, "relative_offset_displace", text="") col.separator() - col.prop(md, "add_offset_object") + col.prop(md, "use_object_offset") sub = col.column() - sub.active = md.add_offset_object + sub.active = md.use_object_offset sub.prop(md, "offset_object", text="") layout.separator() @@ -126,7 +126,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "width") col = split.column() - col.prop(md, "only_vertices") + col.prop(md, "use_only_vertices") layout.label(text="Limit Method:") layout.row().prop(md, "limit_method", expand=True) @@ -176,7 +176,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "factor") col.prop(md, "radius") col.prop(md, "size") - col.prop(md, "from_radius") + col.prop(md, "use_radius_as_size") split = layout.split() @@ -224,10 +224,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.label(text="Direction:") col.prop(md, "direction", text="") col.label(text="Texture Coordinates:") - col.prop(md, "texture_coordinates", text="") - if md.texture_coordinates == 'OBJECT': + col.prop(md, "texture_coords", text="") + if md.texture_coords == 'OBJECT': layout.prop(md, "texture_coordinate_object", text="Object") - elif md.texture_coordinates == 'UV' and ob.type == 'MESH': + elif md.texture_coords == 'UV' and ob.type == 'MESH': layout.prop_object(md, "uv_layer", ob.data, "uv_textures") layout.separator() @@ -235,7 +235,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(md, "midlevel") + col.prop(md, "mid_level") col = split.column() col.prop(md, "strength") @@ -250,7 +250,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): sub.prop(md, "split_angle") col = split.column() - col.prop(md, "use_sharp", text="Sharp Edges") + col.prop(md, "use_edge_sharp", text="Sharp Edges") def EXPLODE(self, layout, ob, md): split = layout.split() @@ -263,7 +263,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): sub.prop(md, "protect") col = split.column() - col.prop(md, "split_edges") + col.prop(md, "use_edge_split") col.prop(md, "show_unborn") col.prop(md, "show_alive") col.prop(md, "show_dead") @@ -365,7 +365,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "dynamic") def MIRROR(self, layout, ob, md): - layout.prop(md, "merge_limit") + layout.prop(md, "merge_threshold") split = layout.split(percentage=0.25) col = split.column() @@ -377,12 +377,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Options:") col.prop(md, "clip", text="Clipping") - col.prop(md, "mirror_vertex_groups", text="Vertex Groups") + col.prop(md, "use_mirror_vertex_groups", text="Vertex Groups") col = split.column() col.label(text="Textures:") - col.prop(md, "mirror_u", text="U") - col.prop(md, "mirror_v", text="V") + col.prop(md, "use_mirror_u", text="U") + col.prop(md, "use_mirror_v", text="V") col = layout.column() col.label(text="Mirror Object:") @@ -420,7 +420,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): def PARTICLE_INSTANCE(self, layout, ob, md): layout.prop(md, "object") - layout.prop(md, "particle_system_number", text="Particle System") + layout.prop(md, "particle_system_index", text="Particle System") split = layout.split() col = split.column() @@ -443,7 +443,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): split.active = md.use_path col = split.column() col.row().prop(md, "axis", expand=True) - col.prop(md, "keep_shape") + col.prop(md, "use_preserve_shape") col = split.column() col.prop(md, "position", slider=True) @@ -510,14 +510,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Cull Faces:") - col.prop(md, "cull_front_faces", text="Front") - col.prop(md, "cull_back_faces", text="Back") + col.prop(md, "use_cull_front_faces", text="Front") + col.prop(md, "use_cull_back_faces", text="Back") layout.label(text="Auxiliary Target:") layout.prop(md, "auxiliary_target", text="") elif md.mode == 'NEAREST_SURFACEPOINT': - layout.prop(md, "keep_above_surface") + layout.prop(md, "use_keep_above_surface") def SIMPLE_DEFORM(self, layout, ob, md): split = layout.split() @@ -544,8 +544,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "factor") col.prop(md, "limits", slider=True) if md.mode in ('TAPER', 'STRETCH'): - col.prop(md, "lock_x_axis") - col.prop(md, "lock_y_axis") + col.prop(md, "lock_x") + col.prop(md, "lock_y") def SMOKE(self, layout, ob, md): layout.label(text="See Smoke panel.") @@ -611,7 +611,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Options:") - col.prop(md, "subsurf_uv") + col.prop(md, "use_subsurf_uv") col.prop(md, "show_only_control_edges") def SURFACE(self, layout, ob, md): @@ -631,8 +631,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(md, "override_image") - col.prop(md, "num_projectors", text="Projectors") + col.prop(md, "use_image_override") + col.prop(md, "projector_count", text="Projectors") for proj in md.projectors: col.prop(proj, "object", text="") @@ -658,9 +658,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "normals") sub = col.column() sub.active = md.normals - sub.prop(md, "x_normal", text="X") - sub.prop(md, "y_normal", text="Y") - sub.prop(md, "z_normal", text="Z") + sub.prop(md, "use_normal_x", text="X") + sub.prop(md, "use_normal_y", text="Y") + sub.prop(md, "use_normal_z", text="Z") split = layout.split() @@ -683,10 +683,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): layout.prop(md, "start_position_object") layout.prop_object(md, "vertex_group", ob, "vertex_groups") layout.prop(md, "texture") - layout.prop(md, "texture_coordinates") - if md.texture_coordinates == 'MAP_UV' and ob.type == 'MESH': + layout.prop(md, "texture_coords") + if md.texture_coords == 'MAP_UV' and ob.type == 'MESH': layout.prop_object(md, "uv_layer", ob.data, "uv_textures") - elif md.texture_coordinates == 'OBJECT': + elif md.texture_coords == 'OBJECT': layout.prop(md, "texture_coords_object") layout.separator() diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index ee026a3663a..f90a5446557 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -122,25 +122,25 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel): col.label(text="Attributes:") col.prop(game, "mass") col.prop(soft, "weld_threshold") - col.prop(soft, "position_iterations") - col.prop(soft, "linstiff", slider=True) + col.prop(soft, "location_iterations") + col.prop(soft, "linear_stiffness", slider=True) col.prop(soft, "dynamic_friction", slider=True) col.prop(soft, "collision_margin", slider=True) - col.prop(soft, "bending_const", text="Bending Constraints") + col.prop(soft, "use_bending_constraints", text="Bending Constraints") col = split.column() - col.prop(soft, "shape_match") + col.prop(soft, "use_shape_match") sub = col.column() - sub.active = soft.shape_match + sub.active = soft.use_shape_match sub.prop(soft, "shape_threshold", slider=True) col.separator() col.label(text="Cluster Collision:") - col.prop(soft, "cluster_rigid_to_softbody") - col.prop(soft, "cluster_soft_to_softbody") + col.prop(soft, "use_cluster_rigid_to_softbody") + col.prop(soft, "use_cluster_soft_to_softbody") sub = col.column() - sub.active = (soft.cluster_rigid_to_softbody or soft.cluster_soft_to_softbody) + sub.active = (soft.cluster_rigid_to_softbody or soft.use_cluster_soft_to_softbody) sub.prop(soft, "cluster_iterations", text="Iterations") elif game.physics_type == 'STATIC': @@ -236,9 +236,9 @@ class RENDER_PT_game_player(RenderButtonsPanel, bpy.types.Panel): # framing: col = layout.column() col.label(text="Framing:") - col.row().prop(gs, "framing_type", expand=True) - if gs.framing_type == 'LETTERBOX': - col.prop(gs, "framing_color", text="") + col.row().prop(gs, "frame_type", expand=True) + if gs.frame_type == 'LETTERBOX': + col.prop(gs, "frame_color", text="") class RENDER_PT_game_stereo(RenderButtonsPanel, bpy.types.Panel): @@ -257,7 +257,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, bpy.types.Panel): # stereo: if stereo_mode == 'STEREO': layout.prop(gs, "stereo_mode") - layout.prop(gs, "eye_separation") + layout.prop(gs, "stereo_eye_separation") # dome: elif stereo_mode == 'DOME': @@ -310,14 +310,14 @@ class RENDER_PT_game_shading(RenderButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(gs, "glsl_lights", text="Lights") - col.prop(gs, "glsl_shaders", text="Shaders") - col.prop(gs, "glsl_shadows", text="Shadows") + col.prop(gs, "use_glsl_lights", text="Lights") + col.prop(gs, "use_glsl_shaders", text="Shaders") + col.prop(gs, "use_glsl_shadows", text="Shadows") col = split.column() - col.prop(gs, "glsl_ramps", text="Ramps") - col.prop(gs, "glsl_nodes", text="Nodes") - col.prop(gs, "glsl_extra_textures", text="Extra Textures") + col.prop(gs, "use_glsl_ramps", text="Ramps") + col.prop(gs, "use_glsl_nodes", text="Nodes") + col.prop(gs, "use_glsl_extra_textures", text="Extra Textures") class RENDER_PT_game_performance(RenderButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_material.py b/release/scripts/ui/properties_material.py index 2ecaeff7c90..d4e07f8333b 100644 --- a/release/scripts/ui/properties_material.py +++ b/release/scripts/ui/properties_material.py @@ -149,16 +149,16 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel, bpy.types.Panel): col = split.column() col.prop(mat, "diffuse_color", text="") sub = col.column() - sub.active = (not mat.shadeless) + sub.active = (not mat.use_shadeless) sub.prop(mat, "diffuse_intensity", text="Intensity") col = split.column() - col.active = (not mat.shadeless) + col.active = (not mat.use_shadeless) col.prop(mat, "diffuse_shader", text="") col.prop(mat, "use_diffuse_ramp", text="Ramp") col = layout.column() - col.active = (not mat.shadeless) + col.active = (not mat.use_shadeless) if mat.diffuse_shader == 'OREN_NAYAR': col.prop(mat, "roughness") elif mat.diffuse_shader == 'MINNAERT': @@ -211,7 +211,7 @@ class MATERIAL_PT_specular(MaterialButtonsPanel, bpy.types.Panel): mat = active_node_mat(context.material) - layout.active = (not mat.shadeless) + layout.active = (not mat.use_shadeless) split = layout.split() @@ -281,17 +281,17 @@ class MATERIAL_PT_shading(MaterialButtonsPanel, bpy.types.Panel): col = split.column() sub = col.column() - sub.active = not mat.shadeless + sub.active = not mat.use_shadeless sub.prop(mat, "emit") sub.prop(mat, "ambient") sub = col.column() sub.prop(mat, "translucency") col = split.column() - col.prop(mat, "shadeless") + col.prop(mat, "use_shadeless") sub = col.column() - sub.active = not mat.shadeless - sub.prop(mat, "tangent_shading") + sub.active = not mat.use_shadeless + sub.prop(mat, "use_tangent_shading") sub.prop(mat, "cubic") elif mat.type == 'HALO': @@ -312,7 +312,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel): def draw_header(self, context): mat = active_node_mat(context.material) - self.layout.prop(mat, "transparency", text="") + self.layout.prop(mat, "use_transparency", text="") def draw(self, context): layout = self.layout @@ -321,7 +321,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel): rayt = mat.raytrace_transparency row = layout.row() - row.active = mat.transparency and (not mat.shadeless) + row.active = mat.use_transparency and (not mat.use_shadeless) row.prop(mat, "transparency_method", expand=True) split = layout.split() @@ -329,11 +329,11 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel): col = split.column() col.prop(mat, "alpha") row = col.row() - row.active = mat.transparency and (not mat.shadeless) + row.active = mat.use_transparency and (not mat.use_shadeless) row.prop(mat, "specular_alpha", text="Specular") col = split.column() - col.active = (not mat.shadeless) + col.active = (not mat.use_shadeless) col.prop(rayt, "fresnel") sub = col.column() sub.active = rayt.fresnel > 0 @@ -342,7 +342,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel): if mat.transparency_method == 'RAYTRACE': layout.separator() split = layout.split() - split.active = mat.transparency + split.active = mat.use_transparency col = split.column() col.prop(rayt, "ior") @@ -433,7 +433,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel, bpy.types.Panel): mat = active_node_mat(context.material) sss = mat.subsurface_scattering - self.layout.active = (not mat.shadeless) + self.layout.active = (not mat.use_shadeless) self.layout.prop(sss, "use", text="") def draw(self, context): @@ -442,7 +442,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel, bpy.types.Panel): mat = active_node_mat(context.material) sss = mat.subsurface_scattering - layout.active = (sss.use) and (not mat.shadeless) + layout.active = (sss.use) and (not mat.use_shadeless) row = layout.row().split() sub = row.row(align=True).split(percentage=0.75) @@ -466,7 +466,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel, bpy.types.Panel): sub.prop(sss, "front") sub.prop(sss, "back") col.separator() - col.prop(sss, "error_tolerance", text="Error") + col.prop(sss, "error_threshold", text="Error") class MATERIAL_PT_halo(MaterialButtonsPanel, bpy.types.Panel): @@ -494,8 +494,8 @@ class MATERIAL_PT_halo(MaterialButtonsPanel, bpy.types.Panel): col.prop(halo, "add") col.label(text="Options:") col.prop(halo, "texture") - col.prop(halo, "vertex_normal") - col.prop(halo, "xalpha") + col.prop(halo, "use_vertex_normal") + col.prop(halo, "use_extreme_alpha") col.prop(halo, "shaded") col.prop(halo, "soft") @@ -503,19 +503,19 @@ class MATERIAL_PT_halo(MaterialButtonsPanel, bpy.types.Panel): col.prop(halo, "ring") sub = col.column() sub.active = halo.ring - sub.prop(halo, "rings") + sub.prop(halo, "ring_count") sub.prop(mat, "mirror_color", text="") col.separator() col.prop(halo, "lines") sub = col.column() sub.active = halo.lines - sub.prop(halo, "line_number", text="Lines") + sub.prop(halo, "line_count", text="Lines") sub.prop(mat, "specular_color", text="") col.separator() col.prop(halo, "star") sub = col.column() sub.active = halo.star - sub.prop(halo, "star_tips") + sub.prop(halo, "star_tip_count") class MATERIAL_PT_flare(MaterialButtonsPanel, bpy.types.Panel): @@ -531,7 +531,7 @@ class MATERIAL_PT_flare(MaterialButtonsPanel, bpy.types.Panel): def draw_header(self, context): halo = context.material.halo - self.layout.prop(halo, "flare_mode", text="") + self.layout.prop(halo, "use_flare_mode", text="") def draw(self, context): layout = self.layout @@ -539,7 +539,7 @@ class MATERIAL_PT_flare(MaterialButtonsPanel, bpy.types.Panel): mat = context.material # dont use node material halo = mat.halo - layout.active = halo.flare_mode + layout.active = halo.use_flare_mode split = layout.split() @@ -549,8 +549,8 @@ class MATERIAL_PT_flare(MaterialButtonsPanel, bpy.types.Panel): col.prop(halo, "flare_seed", text="Seed") col = split.column() - col.prop(halo, "flares_sub", text="Subflares") - col.prop(halo, "flare_subsize", text="Subsize") + col.prop(halo, "flare_subflare_count", text="Subflares") + col.prop(halo, "flare_subflare_size", text="Subsize") class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel): @@ -571,7 +571,7 @@ class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel): col = split.column() col.prop(phys, "distance") col.prop(phys, "friction") - col.prop(phys, "align_to_normal") + col.prop(phys, "use_normal_align") col = split.column() col.prop(phys, "force", slider=True) @@ -603,11 +603,11 @@ class MATERIAL_PT_strand(MaterialButtonsPanel, bpy.types.Panel): sub.label(text="Size:") sub.prop(tan, "root_size", text="Root") sub.prop(tan, "tip_size", text="Tip") - sub.prop(tan, "min_size", text="Minimum") - sub.prop(tan, "blender_units") + sub.prop(tan, "size_min", text="Minimum") + sub.prop(tan, "use_blender_units") sub = col.column() - sub.active = (not mat.shadeless) - sub.prop(tan, "tangent_shading") + sub.active = (not mat.use_shadeless) + sub.prop(tan, "use_tangent_shading") col.prop(tan, "shape") col = split.column() @@ -620,10 +620,10 @@ class MATERIAL_PT_strand(MaterialButtonsPanel, bpy.types.Panel): col.prop(tan, "uv_layer", text="") col.separator() sub = col.column() - sub.active = (not mat.shadeless) - sub.prop(tan, "surface_diffuse") + sub.active = (not mat.use_shadeless) + sub.prop(tan, "use_surface_diffuse") sub = col.column() - sub.active = tan.surface_diffuse + sub.active = tan.use_surface_diffuse sub.prop(tan, "blend_distance", text="Distance") @@ -645,30 +645,30 @@ class MATERIAL_PT_options(MaterialButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(mat, "traceable") - col.prop(mat, "full_oversampling") + col.prop(mat, "use_raytrace") + col.prop(mat, "use_full_oversampling") col.prop(mat, "use_sky") col.prop(mat, "use_mist") col.prop(mat, "invert_z") sub = col.row() - sub.prop(mat, "z_offset") - sub.active = mat.transparency and mat.transparency_method == 'Z_TRANSPARENCY' + sub.prop(mat, "offset_z") + sub.active = mat.use_transparency and mat.transparency_method == 'Z_TRANSPARENCY' sub = col.column(align=True) sub.label(text="Light Group:") sub.prop(mat, "light_group", text="") row = sub.row() row.active = bool(mat.light_group) - row.prop(mat, "light_group_exclusive", text="Exclusive") + row.prop(mat, "use_light_group_exclusive", text="Exclusive") col = split.column() - col.prop(mat, "face_texture") + col.prop(mat, "use_face_texture") sub = col.column() - sub.active = mat.face_texture - sub.prop(mat, "face_texture_alpha") + sub.active = mat.use_face_texture + sub.prop(mat, "use_face_texture_alpha") col.separator() - col.prop(mat, "vertex_color_paint") - col.prop(mat, "vertex_color_light") - col.prop(mat, "object_color") + col.prop(mat, "use_vertex_color_paint") + col.prop(mat, "use_vertex_color_light") + col.prop(mat, "use_object_color") class MATERIAL_PT_shadow(MaterialButtonsPanel, bpy.types.Panel): @@ -691,21 +691,21 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel, bpy.types.Panel): col = split.column() col.prop(mat, "shadows", text="Receive") - col.prop(mat, "receive_transparent_shadows", text="Receive Transparent") - col.prop(mat, "only_shadow", text="Shadows Only") - col.prop(mat, "cast_shadows_only", text="Cast Only") - col.prop(mat, "shadow_casting_alpha", text="Casting Alpha") + col.prop(mat, "use_transparent_shadows", text="Receive Transparent") + col.prop(mat, "use_only_shadow", text="Shadows Only") + col.prop(mat, "use_cast_shadows_only", text="Cast Only") + col.prop(mat, "shadow_cast_alpha", text="Casting Alpha") col = split.column() - col.prop(mat, "cast_buffer_shadows") + col.prop(mat, "use_cast_buffer_shadows") sub = col.column() - sub.active = mat.cast_buffer_shadows + sub.active = mat.use_cast_buffer_shadows sub.prop(mat, "shadow_buffer_bias", text="Buffer Bias") - col.prop(mat, "ray_shadow_bias", text="Auto Ray Bias") + col.prop(mat, "use_ray_shadow_bias", text="Auto Ray Bias") sub = col.column() - sub.active = (not mat.ray_shadow_bias) + sub.active = (not mat.use_ray_shadow_bias) sub.prop(mat, "shadow_ray_bias", text="Ray Bias") - col.prop(mat, "cast_approximate") + col.prop(mat, "use_cast_approximate") class MATERIAL_PT_transp_game(MaterialButtonsPanel, bpy.types.Panel): @@ -722,7 +722,7 @@ class MATERIAL_PT_transp_game(MaterialButtonsPanel, bpy.types.Panel): def draw_header(self, context): mat = active_node_mat(context.material) - self.layout.prop(mat, "transparency", text="") + self.layout.prop(mat, "use_transparency", text="") def draw(self, context): layout = self.layout @@ -731,7 +731,7 @@ class MATERIAL_PT_transp_game(MaterialButtonsPanel, bpy.types.Panel): rayt = mat.raytrace_transparency row = layout.row() - row.active = mat.transparency and (not mat.shadeless) + row.active = mat.use_transparency and (not mat.use_shadeless) row.prop(mat, "transparency_method", expand=True) split = layout.split() @@ -810,21 +810,21 @@ class MATERIAL_PT_volume_lighting(VolumeButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(vol, "lighting_mode", text="") + col.prop(vol, "light_method", text="") col = split.column() - if vol.lighting_mode == 'SHADED': - col.prop(vol, "external_shadows") - col.prop(vol, "light_cache") + if vol.light_method == 'SHADED': + col.prop(vol, "use_external_shadows") + col.prop(vol, "use_light_cache") sub = col.column() - sub.active = vol.light_cache + sub.active = vol.use_light_cache sub.prop(vol, "cache_resolution") - elif vol.lighting_mode in ('MULTIPLE_SCATTERING', 'SHADED_PLUS_MULTIPLE_SCATTERING'): + elif vol.light_method in ('MULTIPLE_SCATTERING', 'SHADED_PLUS_MULTIPLE_SCATTERING'): sub = col.column() sub.enabled = True sub.active = False - sub.prop(vol, "light_cache") + sub.prop(vol, "use_light_cache") col.prop(vol, "cache_resolution") sub = col.column(align=True) @@ -859,13 +859,13 @@ class MATERIAL_PT_volume_integration(VolumeButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Step Calculation:") - col.prop(vol, "step_calculation", text="") + col.prop(vol, "step_method", text="") col = col.column(align=True) col.prop(vol, "step_size") col = split.column() col.label() - col.prop(vol, "depth_cutoff") + col.prop(vol, "depth_threshold") class MATERIAL_PT_volume_options(VolumeButtonsPanel, bpy.types.Panel): @@ -881,8 +881,8 @@ class MATERIAL_PT_volume_options(VolumeButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(mat, "traceable") - col.prop(mat, "full_oversampling") + col.prop(mat, "use_raytrace") + col.prop(mat, "use_full_oversampling") col.prop(mat, "use_mist") col = split.column() @@ -890,7 +890,7 @@ class MATERIAL_PT_volume_options(VolumeButtonsPanel, bpy.types.Panel): col.prop(mat, "light_group", text="") row = col.row() row.active = bool(mat.light_group) - row.prop(mat, "light_group_exclusive", text="Exclusive") + row.prop(mat, "use_light_group_exclusive", text="Exclusive") class MATERIAL_PT_custom_props(MaterialButtonsPanel, PropertyPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py index 2bc685d972a..a87a43a7998 100644 --- a/release/scripts/ui/properties_object.py +++ b/release/scripts/ui/properties_object.py @@ -172,7 +172,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(ob, "max_draw_type", text="Type") + col.prop(ob, "draw_type", text="Type") col = split.column() row = col.row() @@ -219,7 +219,7 @@ class OBJECT_PT_duplication(ObjectButtonsPanel, bpy.types.Panel): layout.prop(ob, "use_dupli_frames_speed", text="Speed") elif ob.dupli_type == 'VERTS': - layout.prop(ob, "use_dupli_verts_rotation", text="Rotation") + layout.prop(ob, "use_dupli_vertices_rotation", text="Rotation") elif ob.dupli_type == 'FACES': split = layout.split() @@ -249,15 +249,15 @@ class OBJECT_PT_animation(ObjectButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Time Offset:") - col.prop(ob, "time_offset_edit", text="Edit") + col.prop(ob, "use_time_offset_edit", text="Edit") row = col.row() - row.prop(ob, "time_offset_particle", text="Particle") + row.prop(ob, "use_time_offset_particle", text="Particle") row.active = bool(ob.particle_systems) row = col.row() - row.prop(ob, "time_offset_parent", text="Parent") + row.prop(ob, "use_time_offset_parent", text="Parent") row.active = (ob.parent is not None) row = col.row() - row.prop(ob, "slow_parent") + row.prop(ob, "use_slow_parent") row.active = (ob.parent is not None) col.prop(ob, "time_offset", text="Offset") diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/ui/properties_object_constraint.py index 59eb8e40e78..be102a17103 100644 --- a/release/scripts/ui/properties_object_constraint.py +++ b/release/scripts/ui/properties_object_constraint.py @@ -86,7 +86,7 @@ class ConstraintButtonsPanel(): col.prop(con, "use_stretch") col = split.column() - col.prop(con, "chain_length") + col.prop(con, "chain_count") col.prop(con, "use_target") def CHILD_OF(self, context, layout, con): @@ -133,7 +133,7 @@ class ConstraintButtonsPanel(): col.prop(con, "up", text="Up") col = split.column() - col.prop(con, "target_z") + col.prop(con, "use_target_z") self.space_template(layout, con) @@ -157,7 +157,7 @@ class ConstraintButtonsPanel(): split = layout.split() col = split.column() col.prop(con, "iterations") - col.prop(con, "chain_length") + col.prop(con, "chain_count") col.label(text="Weight:") col.prop(con, "weight", text="Position", slider=True) @@ -178,20 +178,20 @@ class ConstraintButtonsPanel(): row = layout.row() row.label(text="Axis Ref:") - row.prop(con, "axis_reference", expand=True) + row.prop(con, "reference_axis", expand=True) split = layout.split(percentage=0.33) - split.row().prop(con, "use_position") + split.row().prop(con, "use_location") row = split.row() row.prop(con, "weight", text="Weight", slider=True) - row.active = con.use_position + row.active = con.use_location split = layout.split(percentage=0.33) row = split.row() row.label(text="Lock:") row = split.row() - row.prop(con, "pos_lock_x", text="X") - row.prop(con, "pos_lock_y", text="Y") - row.prop(con, "pos_lock_z", text="Z") - split.active = con.use_position + row.prop(con, "lock_location_x", text="X") + row.prop(con, "lock_location_y", text="Y") + row.prop(con, "lock_location_z", text="Z") + split.active = con.use_location split = layout.split(percentage=0.33) split.row().prop(con, "use_rotation") @@ -202,9 +202,9 @@ class ConstraintButtonsPanel(): row = split.row() row.label(text="Lock:") row = split.row() - row.prop(con, "rot_lock_x", text="X") - row.prop(con, "rot_lock_y", text="Y") - row.prop(con, "rot_lock_z", text="Z") + row.prop(con, "lock_rotation_x", text="X") + row.prop(con, "lock_rotation_y", text="Y") + row.prop(con, "lock_rotation_z", text="Z") split.active = con.use_rotation def IK_DISTANCE(self, context, layout, con): @@ -226,8 +226,8 @@ class ConstraintButtonsPanel(): col.prop(con, "use_curve_radius") col = split.column() - col.prop(con, "use_fixed_position") - if con.use_fixed_position: + col.prop(con, "use_fixed_location") + if con.use_fixed_location: col.prop(con, "offset_factor", text="Offset") else: col.prop(con, "offset") @@ -248,25 +248,25 @@ class ConstraintButtonsPanel(): col.prop(con, "use_limit_x") sub = col.column() sub.active = con.use_limit_x - sub.prop(con, "minimum_x", text="Min") - sub.prop(con, "maximum_x", text="Max") + sub.prop(con, "min_x", text="Min") + sub.prop(con, "max_x", text="Max") col = split.column(align=True) col.prop(con, "use_limit_y") sub = col.column() sub.active = con.use_limit_y - sub.prop(con, "minimum_y", text="Min") - sub.prop(con, "maximum_y", text="Max") + sub.prop(con, "min_y", text="Min") + sub.prop(con, "max_y", text="Max") col = split.column(align=True) col.prop(con, "use_limit_z") sub = col.column() sub.active = con.use_limit_z - sub.prop(con, "minimum_z", text="Min") - sub.prop(con, "maximum_z", text="Max") + sub.prop(con, "min_z", text="Min") + sub.prop(con, "max_z", text="Max") row = layout.row() - row.prop(con, "limit_transform") + row.prop(con, "use_transform_limit") row.label() row = layout.row() @@ -277,37 +277,37 @@ class ConstraintButtonsPanel(): split = layout.split() col = split.column() - col.prop(con, "use_minimum_x") + col.prop(con, "use_min_x") sub = col.column() - sub.active = con.use_minimum_x - sub.prop(con, "minimum_x", text="") - col.prop(con, "use_maximum_x") + sub.active = con.use_min_x + sub.prop(con, "min_x", text="") + col.prop(con, "use_max_x") sub = col.column() - sub.active = con.use_maximum_x - sub.prop(con, "maximum_x", text="") + sub.active = con.use_max_x + sub.prop(con, "max_x", text="") col = split.column() - col.prop(con, "use_minimum_y") + col.prop(con, "use_min_y") sub = col.column() - sub.active = con.use_minimum_y - sub.prop(con, "minimum_y", text="") - col.prop(con, "use_maximum_y") + sub.active = con.use_min_y + sub.prop(con, "min_y", text="") + col.prop(con, "use_max_y") sub = col.column() - sub.active = con.use_maximum_y - sub.prop(con, "maximum_y", text="") + sub.active = con.use_max_y + sub.prop(con, "max_y", text="") col = split.column() - col.prop(con, "use_minimum_z") + col.prop(con, "use_min_z") sub = col.column() - sub.active = con.use_minimum_z - sub.prop(con, "minimum_z", text="") - col.prop(con, "use_maximum_z") + sub.active = con.use_min_z + sub.prop(con, "min_z", text="") + col.prop(con, "use_max_z") sub = col.column() - sub.active = con.use_maximum_z - sub.prop(con, "maximum_z", text="") + sub.active = con.use_max_z + sub.prop(con, "max_z", text="") row = layout.row() - row.prop(con, "limit_transform") + row.prop(con, "use_transform_limit") row.label() row = layout.row() @@ -318,37 +318,37 @@ class ConstraintButtonsPanel(): split = layout.split() col = split.column() - col.prop(con, "use_minimum_x") + col.prop(con, "use_min_x") sub = col.column() - sub.active = con.use_minimum_x - sub.prop(con, "minimum_x", text="") - col.prop(con, "use_maximum_x") + sub.active = con.use_min_x + sub.prop(con, "min_x", text="") + col.prop(con, "use_max_x") sub = col.column() - sub.active = con.use_maximum_x - sub.prop(con, "maximum_x", text="") + sub.active = con.use_max_x + sub.prop(con, "max_x", text="") col = split.column() - col.prop(con, "use_minimum_y") + col.prop(con, "use_min_y") sub = col.column() - sub.active = con.use_minimum_y - sub.prop(con, "minimum_y", text="") - col.prop(con, "use_maximum_y") + sub.active = con.use_min_y + sub.prop(con, "min_y", text="") + col.prop(con, "use_max_y") sub = col.column() - sub.active = con.use_maximum_y - sub.prop(con, "maximum_y", text="") + sub.active = con.use_max_y + sub.prop(con, "max_y", text="") col = split.column() - col.prop(con, "use_minimum_z") + col.prop(con, "use_min_z") sub = col.column() - sub.active = con.use_minimum_z - sub.prop(con, "minimum_z", text="") - col.prop(con, "use_maximum_z") + sub.active = con.use_min_z + sub.prop(con, "min_z", text="") + col.prop(con, "use_max_z") sub = col.column() - sub.active = con.use_maximum_z - sub.prop(con, "maximum_z", text="") + sub.active = con.use_max_z + sub.prop(con, "max_z", text="") row = layout.row() - row.prop(con, "limit_transform") + row.prop(con, "use_transform_limit") row.label() row = layout.row() @@ -454,8 +454,8 @@ class ConstraintButtonsPanel(): col = split.column(align=True) col.label(text="Target Range:") - col.prop(con, "minimum", text="Min") - col.prop(con, "maximum", text="Max") + col.prop(con, "min", text="Min") + col.prop(con, "max", text="Max") row = layout.row() row.label(text="Convert:") @@ -489,7 +489,7 @@ class ConstraintButtonsPanel(): split = layout.split() col = split.column() - col.prop(con, "original_length", text="Rest Length") + col.prop(con, "rest_length", text="Rest Length") col = split.column() col.operator("constraint.stretchto_reset", text="Reset") @@ -566,7 +566,7 @@ class ConstraintButtonsPanel(): def TRANSFORM(self, context, layout, con): self.target_template(layout, con) - layout.prop(con, "extrapolate_motion", text="Extrapolate") + layout.prop(con, "use_motion_extrapolate", text="Extrapolate") col = layout.column() col.row().label(text="Source:") @@ -647,14 +647,14 @@ class ConstraintButtonsPanel(): col = layout.column() col.label(text="Spline Fitting:") - col.prop(con, "chain_length") - col.prop(con, "even_divisions") - col.prop(con, "chain_offset") + col.prop(con, "chain_count") + col.prop(con, "use_even_divisions") + col.prop(con, "use_chain_offset") col = layout.column() col.label(text="Chain Scaling:") - col.prop(con, "y_stretch") - col.prop(con, "xz_scaling_mode") + col.prop(con, "use_y_stretch") + col.prop(con, "xz_scale_mode") col.prop(con, "use_curve_radius") def PIVOT(self, context, layout, con): @@ -665,14 +665,14 @@ class ConstraintButtonsPanel(): col.prop(con, "offset", text="Pivot Offset") else: col = layout.column() - col.prop(con, "use_relative_position") - if con.use_relative_position: + col.prop(con, "use_relative_location") + if con.use_relative_location: col.prop(con, "offset", text="Relative Pivot Point") else: col.prop(con, "offset", text="Absolute Pivot Point") col = layout.column() - col.prop(con, "enabled_rotation_range", text="Pivot When") + col.prop(con, "rotation_range", text="Pivot When") class OBJECT_PT_constraints(ConstraintButtonsPanel, bpy.types.Panel): bl_label = "Object Constraints" diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index 618d8e5486e..65070772d09 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -168,7 +168,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): col = split.column(align=True) col.prop(part, "lifetime") - col.prop(part, "random_lifetime", slider=True) + col.prop(part, "lifetime_random", slider=True) layout.row().label(text="Emit From:") @@ -178,7 +178,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() row.prop(part, "trand") if part.distribution != 'GRID': - row.prop(part, "even_distribution") + row.prop(part, "use_even_distribution") if part.emit_from == 'FACE' or part.emit_from == 'VOLUME': row = layout.row() @@ -213,9 +213,9 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, bpy.types.Panel): #cloth = context.cloth.collision_settings #self.layout.active = cloth_panel_enabled(context.cloth) - #self.layout.prop(cloth, "enable_collision", text="") + #self.layout.prop(cloth, "use_collision", text="") psys = context.particle_system - self.layout.prop(psys, "hair_dynamics", text="") + self.layout.prop(psys, "use_hair_dynamics", text="") def draw(self, context): layout = self.layout @@ -228,7 +228,7 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, bpy.types.Panel): #part = psys.settings cloth = psys.cloth.settings - layout.enabled = psys.hair_dynamics + layout.enabled = psys.use_hair_dynamics split = layout.split() @@ -268,12 +268,12 @@ class PARTICLE_PT_cache(ParticleButtonsPanel, bpy.types.Panel): phystype = psys.settings.physics_type if phystype == 'NO' or phystype == 'KEYED': return False - return (psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.hair_dynamics)) and engine in cls.COMPAT_ENGINES + return (psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.use_hair_dynamics)) and engine in cls.COMPAT_ENGINES def draw(self, context): psys = context.particle_system - point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if psys.hair_dynamics else 'PSYS') + point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if psys.use_hair_dynamics else 'PSYS') class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel): @@ -307,7 +307,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel): sub = split.column() sub.label(text="Emitter Object") - sub.prop(part, "object_aligned_factor", text="") + sub.prop(part, "object_align_factor", text="") layout.row().label(text="Other:") split = layout.split() @@ -317,7 +317,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel): else: sub.prop(part, "object_factor", slider=True) sub = split.column() - sub.prop(part, "random_factor") + sub.prop(part, "factor_random") #if part.type=='REACTOR': # sub.prop(part, "reactor_factor") @@ -346,16 +346,16 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, bpy.types.Panel): split = layout.split() split.label(text="Initial Rotation:") - split.prop(part, "rotation_dynamic") + split.prop(part, "use_dynamic_rotation") split = layout.split() sub = split.column(align=True) sub.prop(part, "rotation_mode", text="") - sub.prop(part, "random_rotation_factor", slider=True, text="Random") + sub.prop(part, "rotation_factor_random", slider=True, text="Random") sub = split.column(align=True) sub.prop(part, "phase_factor", slider=True) - sub.prop(part, "random_phase_factor", text="Random", slider=True) + sub.prop(part, "phase_factor_random", text="Random", slider=True) layout.row().label(text="Angular Velocity:") layout.row().prop(part, "angular_velocity_mode", expand=True) @@ -392,12 +392,12 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() col = row.column(align=True) col.prop(part, "particle_size") - col.prop(part, "random_size", slider=True) + col.prop(part, "size_random", slider=True) if part.physics_type != 'NO': col = row.column(align=True) col.prop(part, "mass") - col.prop(part, "sizemass", text="Multiply mass with size") + col.prop(part, "use_multiply_size_mass", text="Multiply mass with size") if part.physics_type == 'NEWTON': split = layout.split() @@ -406,15 +406,15 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): sub.label(text="Forces:") sub.prop(part, "brownian_factor") sub.prop(part, "drag_factor", slider=True) - sub.prop(part, "damp_factor", slider=True) + sub.prop(part, "damping", slider=True) sub = split.column() sub.label(text="Integration:") sub.prop(part, "integrator", text="") sub.prop(part, "time_tweak") sub.prop(part, "subframes") sub = layout.row() - sub.prop(part, "size_deflect") - sub.prop(part, "die_on_collision") + sub.prop(part, "use_size_deflect") + sub.prop(part, "use_die_on_collision") elif part.physics_type == 'FLUID': fluid = part.fluid @@ -424,22 +424,22 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): sub.label(text="Forces:") sub.prop(part, "brownian_factor") sub.prop(part, "drag_factor", slider=True) - sub.prop(part, "damp_factor", slider=True) + sub.prop(part, "damping", slider=True) sub = split.column() sub.label(text="Integration:") sub.prop(part, "integrator", text="") sub.prop(part, "time_tweak") sub.prop(part, "subframes") sub = layout.row() - sub.prop(part, "size_deflect") - sub.prop(part, "die_on_collision") + sub.prop(part, "use_size_deflect") + sub.prop(part, "use_die_on_collision") split = layout.split() sub = split.column() sub.label(text="Fluid Interaction:") sub.prop(fluid, "fluid_radius", slider=True) - sub.prop(fluid, "stiffness_k") - sub.prop(fluid, "stiffness_knear") + sub.prop(fluid, "stiffness") + sub.prop(fluid, "stiffness_near") sub.prop(fluid, "rest_density") sub.label(text="Viscosity:") @@ -449,7 +449,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): sub = split.column() sub.label(text="Springs:") - sub.prop(fluid, "spring_k", text="Force", slider=True) + sub.prop(fluid, "spring_force", text="Force", slider=True) sub.prop(fluid, "rest_length", slider=True) layout.label(text="Multiple fluids interactions:") @@ -462,9 +462,9 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() col = row.column() - col.active = not psys.keyed_timing + col.active = not psys.use_keyed_timing col.prop(part, "keyed_loops", text="Loops") - row.prop(psys, "keyed_timing", text="Use Timing") + row.prop(psys, "use_keyed_timing", text="Use Timing") layout.label(text="Keys:") elif part.physics_type == 'BOIDS': @@ -542,7 +542,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): col.prop(key, "object", text="") col.prop(key, "system", text="System") col = row.column() - col.active = psys.keyed_timing + col.active = psys.use_keyed_timing col.prop(key, "time") col.prop(key, "duration") elif part.physics_type == 'BOIDS': @@ -693,47 +693,47 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): sub.prop(part, "parent") sub = split.column() sub.prop(part, "show_unborn") - sub.prop(part, "died") + sub.prop(part, "use_dead") row = layout.row() - row.prop(part, "ren_as", expand=True) + row.prop(part, "render_type", expand=True) split = layout.split() sub = split.column() - if part.ren_as == 'LINE': + if part.render_type == 'LINE': sub.prop(part, "line_length_tail") sub.prop(part, "line_length_head") sub = split.column() - sub.prop(part, "velocity_length") - elif part.ren_as == 'PATH': - sub.prop(part, "render_strand") + sub.prop(part, "use_velocity_length") + elif part.render_type == 'PATH': + sub.prop(part, "use_strand_primitive") subsub = sub.column() - subsub.active = (part.render_strand is False) - subsub.prop(part, "render_adaptive") + subsub.active = (part.use_strand_primitive is False) + subsub.prop(part, "use_render_adaptive") subsub = sub.column() - subsub.active = part.render_adaptive or part.render_strand == True + subsub.active = part.render_adaptive or part.use_strand_primitive == True subsub.prop(part, "adaptive_angle") subsub = sub.column() - subsub.active = (part.render_adaptive is True and part.render_strand is False) - subsub.prop(part, "adaptive_pix") - sub.prop(part, "hair_bspline") + subsub.active = (part.render_adaptive is True and part.use_strand_primitive is False) + subsub.prop(part, "adaptive_pixel") + sub.prop(part, "use_hair_bspline") sub.prop(part, "render_step", text="Steps") sub = split.column() sub.label(text="Timing:") - sub.prop(part, "abs_path_time") - sub.prop(part, "path_start", text="Start", slider=not part.abs_path_time) - sub.prop(part, "path_end", text="End", slider=not part.abs_path_time) - sub.prop(part, "random_length", text="Random", slider=True) + sub.prop(part, "use_absolute_path_time") + sub.prop(part, "path_start", text="Start", slider=not part.use_absolute_path_time) + sub.prop(part, "path_end", text="End", slider=not part.use_absolute_path_time) + sub.prop(part, "length_random", text="Random", slider=True) row = layout.row() col = row.column() - if part.type == 'HAIR' and part.render_strand == True and part.child_type == 'FACES': - layout.prop(part, "enable_simplify") - if part.enable_simplify == True: + if part.type == 'HAIR' and part.use_strand_primitive == True and part.child_type == 'FACES': + layout.prop(part, "use_simplify") + if part.use_simplify == True: row = layout.row() row.prop(part, "simplify_refsize") row.prop(part, "simplify_rate") @@ -744,25 +744,25 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): sub.active = part.viewport == True sub.prop(part, "simplify_viewport") - elif part.ren_as == 'OBJECT': + elif part.render_type == 'OBJECT': sub.prop(part, "dupli_object") sub.prop(part, "use_global_dupli") - elif part.ren_as == 'GROUP': + elif part.render_type == 'GROUP': sub.prop(part, "dupli_group") split = layout.split() sub = split.column() - sub.prop(part, "whole_group") + sub.prop(part, "use_whole_group") subsub = sub.column() - subsub.active = (part.whole_group is False) + subsub.active = (part.use_whole_group is False) subsub.prop(part, "use_group_count") sub = split.column() subsub = sub.column() - subsub.active = (part.whole_group is False) + subsub.active = (part.use_whole_group is False) subsub.prop(part, "use_global_dupli") - subsub.prop(part, "rand_group") + subsub.prop(part, "use_group_pick_random") - if part.use_group_count and not part.whole_group: + if part.use_group_count and not part.use_whole_group: row = layout.row() row.template_list(part, "dupli_weights", part, "active_dupliweight_index") @@ -779,12 +779,12 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() row.prop(weight, "count") - elif part.ren_as == 'BILLBOARD': + elif part.render_type == 'BILLBOARD': sub.label(text="Align:") row = layout.row() row.prop(part, "billboard_align", expand=True) - row.prop(part, "billboard_lock", text="Lock") + row.prop(part, "lock_billboard", text="Lock") row = layout.row() row.prop(part, "billboard_object") @@ -792,7 +792,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): col = row.column(align=True) col.label(text="Tilt:") col.prop(part, "billboard_tilt", text="Angle", slider=True) - col.prop(part, "billboard_random_tilt", slider=True) + col.prop(part, "billboard_tilt_random", slider=True) col = row.column() col.prop(part, "billboard_offset") @@ -810,17 +810,17 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): row.label(text="Animate:") row.prop(part, "billboard_animation", text="") row.label(text="Offset:") - row.prop(part, "billboard_split_offset", text="") + row.prop(part, "billboard_offset_split", text="") - if part.ren_as == 'HALO' or part.ren_as == 'LINE' or part.ren_as == 'BILLBOARD': + if part.render_type == 'HALO' or part.render_type == 'LINE' or part.render_type == 'BILLBOARD': row = layout.row() col = row.column() col.prop(part, "trail_count") if part.trail_count > 1: - col.prop(part, "abs_path_time", text="Length in frames") + col.prop(part, "use_absolute_path_time", text="Length in frames") col = row.column() - col.prop(part, "path_end", text="Length", slider=not part.abs_path_time) - col.prop(part, "random_length", text="Random", slider=True) + col.prop(part, "path_end", text="Length", slider=not part.use_absolute_path_time) + col.prop(part, "length_random", text="Random", slider=True) else: col = row.column() col.label(text="") @@ -848,16 +848,16 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, bpy.types.Panel): part = psys.settings row = layout.row() - row.prop(part, "draw_as", expand=True) + row.prop(part, "draw_method", expand=True) - if part.draw_as == 'NONE' or (part.ren_as == 'NONE' and part.draw_as == 'RENDER'): + if part.draw_method == 'NONE' or (part.render_type == 'NONE' and part.draw_method == 'RENDER'): return - path = (part.ren_as == 'PATH' and part.draw_as == 'RENDER') or part.draw_as == 'PATH' + path = (part.render_type == 'PATH' and part.draw_method == 'RENDER') or part.draw_method == 'PATH' row = layout.row() row.prop(part, "display", slider=True) - if part.draw_as != 'RENDER' or part.ren_as == 'HALO': + if part.draw_method != 'RENDER' or part.render_type == 'HALO': row.prop(part, "draw_size") else: row.label(text="") @@ -906,7 +906,7 @@ class PARTICLE_PT_children(ParticleButtonsPanel, bpy.types.Panel): col = row.column(align=True) col.prop(part, "child_nbr", text="Display") - col.prop(part, "rendered_child_nbr", text="Render") + col.prop(part, "rendered_child_count", text="Render") col = row.column(align=True) @@ -918,7 +918,7 @@ class PARTICLE_PT_children(ParticleButtonsPanel, bpy.types.Panel): col = row.column(align=True) col.prop(part, "child_size", text="Size") - col.prop(part, "child_random_size", text="Random") + col.prop(part, "child_size_random", text="Random") layout.row().label(text="Effects:") @@ -926,27 +926,27 @@ class PARTICLE_PT_children(ParticleButtonsPanel, bpy.types.Panel): col = row.column(align=True) col.prop(part, "clump_factor", slider=True) - col.prop(part, "clumppow", slider=True) + col.prop(part, "clump_shape", slider=True) col = row.column(align=True) - col.prop(part, "rough_endpoint") - col.prop(part, "rough_end_shape") + col.prop(part, "roughness_endpoint") + col.prop(part, "roughness_end_shape") row = layout.row() col = row.column(align=True) - col.prop(part, "rough1") - col.prop(part, "rough1_size") + col.prop(part, "roughness_1") + col.prop(part, "roughness_1_size") col = row.column(align=True) - col.prop(part, "rough2") - col.prop(part, "rough2_size") - col.prop(part, "rough2_thres", slider=True) + col.prop(part, "roughness_2") + col.prop(part, "roughness_2_size") + col.prop(part, "roughness_2_threshold", slider=True) row = layout.row() col = row.column(align=True) col.prop(part, "child_length", slider=True) - col.prop(part, "child_length_thres", slider=True) + col.prop(part, "child_length_threshold", slider=True) col = row.column(align=True) col.label(text="Space reserved for") @@ -987,7 +987,7 @@ class PARTICLE_PT_force_fields(ParticleButtonsPanel, bpy.types.Panel): part = context.particle_system.settings - layout.prop(part, "self_effect") + layout.prop(part, "use_self_effect") split = layout.split(percentage=0.2) split.label(text="Type 1:") @@ -1026,51 +1026,51 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() row.prop_object(psys, "vertex_group_density", ob, "vertex_groups", text="Density") - row.prop(psys, "vertex_group_density_negate", text="") + row.prop(psys, "invert_vertex_group_density", text="") row = layout.row() row.prop_object(psys, "vertex_group_velocity", ob, "vertex_groups", text="Velocity") - row.prop(psys, "vertex_group_velocity_negate", text="") + row.prop(psys, "invert_vertex_group_velocity", text="") row = layout.row() row.prop_object(psys, "vertex_group_length", ob, "vertex_groups", text="Length") - row.prop(psys, "vertex_group_length_negate", text="") + row.prop(psys, "invert_vertex_group_length", text="") row = layout.row() row.prop_object(psys, "vertex_group_clump", ob, "vertex_groups", text="Clump") - row.prop(psys, "vertex_group_clump_negate", text="") + row.prop(psys, "invert_vertex_group_clump", text="") row = layout.row() row.prop_object(psys, "vertex_group_kink", ob, "vertex_groups", text="Kink") - row.prop(psys, "vertex_group_kink_negate", text="") + row.prop(psys, "invert_vertex_group_kink", text="") row = layout.row() - row.prop_object(psys, "vertex_group_roughness1", ob, "vertex_groups", text="Roughness 1") - row.prop(psys, "vertex_group_roughness1_negate", text="") + row.prop_object(psys, "vertex_group_roughness_1", ob, "vertex_groups", text="Roughness 1") + row.prop(psys, "invert_vertex_group_roughness_1", text="") row = layout.row() - row.prop_object(psys, "vertex_group_roughness2", ob, "vertex_groups", text="Roughness 2") - row.prop(psys, "vertex_group_roughness2_negate", text="") + row.prop_object(psys, "vertex_group_roughness_2", ob, "vertex_groups", text="Roughness 2") + row.prop(psys, "invert_vertex_group_roughness_2", text="") row = layout.row() row.prop_object(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End") - row.prop(psys, "vertex_group_roughness_end_negate", text="") + row.prop(psys, "invert_vertex_group_roughness_end", text="") row = layout.row() row.prop_object(psys, "vertex_group_size", ob, "vertex_groups", text="Size") - row.prop(psys, "vertex_group_size_negate", text="") + row.prop(psys, "invert_vertex_group_size", text="") row = layout.row() row.prop_object(psys, "vertex_group_tangent", ob, "vertex_groups", text="Tangent") - row.prop(psys, "vertex_group_tangent_negate", text="") + row.prop(psys, "invert_vertex_group_tangent", text="") row = layout.row() row.prop_object(psys, "vertex_group_rotation", ob, "vertex_groups", text="Rotation") - row.prop(psys, "vertex_group_rotation_negate", text="") + row.prop(psys, "invert_vertex_group_rotation", text="") row = layout.row() row.prop_object(psys, "vertex_group_field", ob, "vertex_groups", text="Field") - row.prop(psys, "vertex_group_field_negate", text="") + row.prop(psys, "invert_vertex_group_field", text="") class PARTICLE_PT_custom_props(ParticleButtonsPanel, PropertyPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py index 8a770066b0b..30619de5814 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -102,9 +102,9 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, bpy.types.Panel): col.prop(cloth, "spring_damping", text="Spring") col.prop(cloth, "air_damping", text="Air") - col.prop(cloth, "pin_cloth", text="Pinning") + col.prop(cloth, "use_pin_cloth", text="Pinning") sub = col.column() - sub.active = cloth.pin_cloth + sub.active = cloth.use_pin_cloth sub.prop_object(cloth, "mass_vertex_group", ob, "vertex_groups", text="") sub.prop(cloth, "pin_stiffness", text="Stiffness") @@ -154,7 +154,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, bpy.types.Panel): cloth = context.cloth.collision_settings self.layout.active = cloth_panel_enabled(context.cloth) - self.layout.prop(cloth, "enable_collision", text="") + self.layout.prop(cloth, "use_collision", text="") def draw(self, context): layout = self.layout @@ -162,21 +162,21 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, bpy.types.Panel): cloth = context.cloth.collision_settings md = context.cloth - layout.active = cloth.enable_collision and cloth_panel_enabled(md) + layout.active = cloth.use_collision and cloth_panel_enabled(md) split = layout.split() col = split.column() col.prop(cloth, "collision_quality", slider=True, text="Quality") - col.prop(cloth, "min_distance", slider=True, text="Distance") + col.prop(cloth, "distance_min", slider=True, text="Distance") col.prop(cloth, "friction") col = split.column() - col.prop(cloth, "enable_self_collision", text="Self Collision") + col.prop(cloth, "use_self_collision", text="Self Collision") sub = col.column() - sub.active = cloth.enable_self_collision + sub.active = cloth.use_self_collision sub.prop(cloth, "self_collision_quality", slider=True, text="Quality") - sub.prop(cloth, "self_min_distance", slider=True, text="Distance") + sub.prop(cloth, "self_distance_min", slider=True, text="Distance") layout.prop(cloth, "group") @@ -193,7 +193,7 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel, bpy.types.Panel): cloth = context.cloth.settings self.layout.active = cloth_panel_enabled(context.cloth) - self.layout.prop(cloth, "stiffness_scaling", text="") + self.layout.prop(cloth, "use_stiffness_scale", text="") def draw(self, context): layout = self.layout @@ -202,7 +202,7 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel, bpy.types.Panel): ob = context.object cloth = context.cloth.settings - layout.active = cloth.stiffness_scaling and cloth_panel_enabled(md) + layout.active = cloth.use_stiffness_scale and cloth_panel_enabled(md) split = layout.split() diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index b4f54e687f3..fb9f2f981ae 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -172,20 +172,20 @@ def basic_force_field_settings_ui(self, context, field): col.prop(field, "noise") col.prop(field, "seed") if field.type == 'TURBULENCE': - col.prop(field, "global_coordinates", text="Global") + col.prop(field, "use_global_coords", text="Global") elif field.type == 'HARMONIC': - col.prop(field, "multiple_springs") + col.prop(field, "use_multiple_springs") split = layout.split() col = split.column() col.label(text="Effect point:") - col.prop(field, "do_location") - col.prop(field, "do_rotation") + col.prop(field, "apply_to_location") + col.prop(field, "apply_to_rotation") col = split.column() col.label(text="Collision:") - col.prop(field, "do_absorption") + col.prop(field, "use_absorption") def basic_force_field_falloff_ui(self, context, field): @@ -209,11 +209,11 @@ def basic_force_field_falloff_ui(self, context, field): sub = col.column() sub.active = field.use_min_distance - sub.prop(field, "minimum_distance", text="Distance") + sub.prop(field, "distance_min", text="Distance") sub = col.column() sub.active = field.use_max_distance - sub.prop(field, "maximum_distance", text="Distance") + sub.prop(field, "distance_max", text="Distance") def register(): diff --git a/release/scripts/ui/properties_physics_field.py b/release/scripts/ui/properties_physics_field.py index e09734b9980..80ea999eedb 100644 --- a/release/scripts/ui/properties_physics_field.py +++ b/release/scripts/ui/properties_physics_field.py @@ -63,7 +63,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel, bpy.types.Panel): col.prop(field, "guide_minimum") col.prop(field, "guide_free") col.prop(field, "falloff_power") - col.prop(field, "guide_path_add") + col.prop(field, "use_guide_path_add") col.prop(field, "use_guide_path_weight") col = split.column() @@ -75,7 +75,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel, bpy.types.Panel): row.prop(field, "use_max_distance") sub = row.row() sub.active = field.use_max_distance - sub.prop(field, "maximum_distance") + sub.prop(field, "distance_max") layout.separator() @@ -100,9 +100,9 @@ class PHYSICS_PT_field(PhysicButtonsPanel, bpy.types.Panel): col.prop(field, "texture_nabla") col = split.column() - col.prop(field, "use_coordinates") - col.prop(field, "root_coordinates") - col.prop(field, "force_2d") + col.prop(field, "use_object_coords") + col.prop(field, "use_root_coords") + col.prop(field, "use_2d_force") else: basic_force_field_settings_ui(self, context, field) @@ -128,11 +128,11 @@ class PHYSICS_PT_field(PhysicButtonsPanel, bpy.types.Panel): sub = col.column() sub.active = field.use_radial_min - sub.prop(field, "radial_minimum", text="Angle") + sub.prop(field, "radial_min", text="Angle") sub = col.column() sub.active = field.use_radial_max - sub.prop(field, "radial_maximum", text="Angle") + sub.prop(field, "radial_max", text="Angle") elif field.falloff_type == 'TUBE': layout.separator() @@ -149,11 +149,11 @@ class PHYSICS_PT_field(PhysicButtonsPanel, bpy.types.Panel): sub = col.column() sub.active = field.use_radial_min - sub.prop(field, "radial_minimum", text="Distance") + sub.prop(field, "radial_min", text="Distance") sub = col.column() sub.active = field.use_radial_max - sub.prop(field, "radial_maximum", text="Distance") + sub.prop(field, "radial_max", text="Distance") class PHYSICS_PT_collision(PhysicButtonsPanel, bpy.types.Panel): @@ -203,22 +203,22 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, bpy.types.Panel): col.label(text="Particle:") col.prop(settings, "permeability", slider=True) col.prop(settings, "stickness") - col.prop(settings, "kill_particles") + col.prop(settings, "use_particle_kill") col.label(text="Particle Damping:") sub = col.column(align=True) sub.prop(settings, "damping_factor", text="Factor", slider=True) - sub.prop(settings, "random_damping", text="Random", slider=True) + sub.prop(settings, "damping_random", text="Random", slider=True) col.label(text="Particle Friction:") sub = col.column(align=True) sub.prop(settings, "friction_factor", text="Factor", slider=True) - sub.prop(settings, "random_friction", text="Random", slider=True) + sub.prop(settings, "friction_random", text="Random", slider=True) col = split.column() col.label(text="Soft Body and Cloth:") sub = col.column(align=True) - sub.prop(settings, "outer_thickness", text="Outer", slider=True) - sub.prop(settings, "inner_thickness", text="Inner", slider=True) + sub.prop(settings, "thickness_outer", text="Outer", slider=True) + sub.prop(settings, "thickness_inner", text="Inner", slider=True) col.label(text="Soft Body Damping:") col.prop(settings, "damping", text="Factor", slider=True) diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py index 35934ebfb32..035eefe6c2a 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -97,8 +97,8 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label() - col.prop(fluid, "generate_speed_vectors") - col.prop(fluid, "reverse_frames") + col.prop(fluid, "use_speed_vectors") + col.prop(fluid, "use_reverse_frames") layout.prop(fluid, "filepath", text="") @@ -108,7 +108,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Volume Initialization:") col.prop(fluid, "volume_initialization", text="") - col.prop(fluid, "export_animated_mesh") + col.prop(fluid, "use_animated_mesh") col = split.column() col.label(text="Initial Velocity:") @@ -120,7 +120,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Volume Initialization:") col.prop(fluid, "volume_initialization", text="") - col.prop(fluid, "export_animated_mesh") + col.prop(fluid, "use_animated_mesh") col = split.column() col.label(text="Slip Type:") @@ -137,8 +137,8 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Volume Initialization:") col.prop(fluid, "volume_initialization", text="") - col.prop(fluid, "export_animated_mesh") - col.prop(fluid, "local_coordinates") + col.prop(fluid, "use_animated_mesh") + col.prop(fluid, "use_local_coords") col = split.column() col.label(text="Inflow Velocity:") @@ -150,7 +150,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Volume Initialization:") col.prop(fluid, "volume_initialization", text="") - col.prop(fluid, "export_animated_mesh") + col.prop(fluid, "use_animated_mesh") split.column() @@ -164,8 +164,8 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Type:") - col.prop(fluid, "drops") - col.prop(fluid, "floats") + col.prop(fluid, "use_drops") + col.prop(fluid, "use_floats") col.prop(fluid, "show_tracer") layout.prop(fluid, "filepath", text="") @@ -176,7 +176,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="") col.prop(fluid, "quality", slider=True) - col.prop(fluid, "reverse_frames") + col.prop(fluid, "use_reverse_frames") col = split.column() col.label(text="Time:") @@ -230,10 +230,10 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, bpy.types.Panel): col.label(text="Using Scene Size Units", icon="SCENE_DATA") sub = col.column() sub.enabled = False - sub.prop(fluid, "real_world_size", text="Metres") + sub.prop(fluid, "simulation_scale", text="Metres") else: col.label(text="Real World Size:") - col.prop(fluid, "real_world_size", text="Metres") + col.prop(fluid, "simulation_scale", text="Metres") col = split.column() col.label(text="Viscosity Presets:") @@ -273,7 +273,7 @@ class PHYSICS_PT_domain_boundary(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Surface:") - col.prop(fluid, "surface_smoothing", text="Smoothing") + col.prop(fluid, "surface_smooth", text="Smoothing") col.prop(fluid, "surface_subdivisions", text="Subdivisions") diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py index 263832b3a3c..f924c1df301 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -71,22 +71,22 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Resolution:") - col.prop(domain, "maxres", text="Divisions") + col.prop(domain, "resolution_max", text="Divisions") col.label(text="Time:") col.prop(domain, "time_scale", text="Scale") col.label(text="Border Collisions:") - col.prop(domain, "smoke_domain_colli", text="") + col.prop(domain, "collision_extents", text="") col = split.column() col.label(text="Behavior:") col.prop(domain, "alpha") col.prop(domain, "beta") col.prop(domain, "vorticity") - col.prop(domain, "dissolve_smoke", text="Dissolve") + col.prop(domain, "use_dissolve_smoke", text="Dissolve") sub = col.column() - sub.active = domain.dissolve_smoke + sub.active = domain.use_dissolve_smoke sub.prop(domain, "dissolve_speed", text="Time") - sub.prop(domain, "dissolve_smoke_log", text="Slow") + sub.prop(domain, "use_dissolve_smoke_log", text="Slow") elif md.smoke_type == 'FLOW': @@ -163,7 +163,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, bpy.types.Panel): cache = md.point_cache_low layout.label(text="Compression:") - layout.prop(md, "smoke_cache_comp", expand=True) + layout.prop(md, "point_cache_compress_type", expand=True) point_cache_ui(self, context, cache, (cache.is_baked is False), 'SMOKE') @@ -180,21 +180,21 @@ class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, bpy.types.Panel): def draw_header(self, context): md = context.smoke.domain_settings - self.layout.prop(md, "highres", text="") + self.layout.prop(md, "use_high_resolution", text="") def draw(self, context): layout = self.layout md = context.smoke.domain_settings - layout.active = md.highres + layout.active = md.use_high_resolution split = layout.split() col = split.column() col.label(text="Resolution:") col.prop(md, "amplify", text="Divisions") - col.prop(md, "smoothemitter") + col.prop(md, "smooth_emitter") col.prop(md, "show_high_resolution") col = split.column() @@ -210,7 +210,7 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel, bpy.types.Panel): @classmethod def poll(cls, context): md = context.smoke - return md and (md.smoke_type == 'DOMAIN') and md.domain_settings.highres + return md and (md.smoke_type == 'DOMAIN') and md.domain_settings.use_high_resolution def draw(self, context): layout = self.layout @@ -219,7 +219,7 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel, bpy.types.Panel): cache = md.point_cache_high layout.label(text="Compression:") - layout.prop(md, "smoke_cache_high_comp", expand=True) + layout.prop(md, "point_cache_compress_high_type", expand=True) point_cache_ui(self, context, cache, (cache.is_baked is False), 'SMOKE') diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py index b377f0b6027..865003531db 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -171,14 +171,14 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, bpy.types.Panel): col.prop(softbody, "push") col.prop(softbody, "damp") col.prop(softbody, "plastic") - col.prop(softbody, "bending") + col.prop(softbody, "bend") col.prop(softbody, "spring_length", text="Length") col.prop_object(softbody, "spring_vertex_group", ob, "vertex_groups", text="Springs:") col = split.column() - col.prop(softbody, "stiff_quads") + col.prop(softbody, "use_stiff_quads") sub = col.column() - sub.active = softbody.stiff_quads + sub.active = softbody.use_stiff_quads sub.prop(softbody, "shear") col.label(text="Aerodynamics:") @@ -190,8 +190,8 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, bpy.types.Panel): col.label(text="Collision:") - col.prop(softbody, "edge_collision", text="Edge") - col.prop(softbody, "face_collision", text="Face") + col.prop(softbody, "use_edge_collision", text="Edge") + col.prop(softbody, "use_face_collision", text="Face") class PHYSICS_PT_softbody_collision(PhysicButtonsPanel, bpy.types.Panel): @@ -206,7 +206,7 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel, bpy.types.Panel): softbody = context.soft_body.settings self.layout.active = softbody_panel_enabled(context.soft_body) - self.layout.prop(softbody, "self_collision", text="") + self.layout.prop(softbody, "use_self_collision", text="") def draw(self, context): layout = self.layout @@ -214,7 +214,7 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel, bpy.types.Panel): md = context.soft_body softbody = md.settings - layout.active = softbody.self_collision and softbody_panel_enabled(md) + layout.active = softbody.use_self_collision and softbody_panel_enabled(md) layout.label(text="Collision Ball Size Calculation:") layout.prop(softbody, "collision_type", expand=True) @@ -247,19 +247,19 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel, bpy.types.Panel): col = split.column(align=True) col.label(text="Step Size:") - col.prop(softbody, "minstep") - col.prop(softbody, "maxstep") + col.prop(softbody, "step_min") + col.prop(softbody, "step_max") col.prop(softbody, "use_auto_step", text="Auto-Step") col = split.column() - col.prop(softbody, "error_limit") + col.prop(softbody, "error_threshold") col.label(text="Helpers:") col.prop(softbody, "choke") col.prop(softbody, "fuzzy") layout.label(text="Diagnostics:") - layout.prop(softbody, "diagnose") - layout.prop(softbody, "estimate_matrix") + layout.prop(softbody, "use_diagnose") + layout.prop(softbody, "use_estimate_matrix") class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py index a0e284ab1f3..2072aa00b76 100644 --- a/release/scripts/ui/properties_render.py +++ b/release/scripts/ui/properties_render.py @@ -320,7 +320,7 @@ class RENDER_PT_output(RenderButtonsPanel, bpy.types.Panel): subsplit = split.split() col = subsplit.column() - col.prop(rd, "exr_half") + col.prop(rd, "use_exr_half") col.prop(rd, "exr_zbuf") col = subsplit.column() diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 9f759e24f53..7996e162b8e 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -228,9 +228,9 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): col = split.column() col.label(text="Coordinates:") col = split.column() - col.prop(tex, "texture_coordinates", text="") + col.prop(tex, "texture_coords", text="") - if tex.texture_coordinates == 'ORCO': + if tex.texture_coords == 'ORCO': """ ob = context.object if ob and ob.type == 'MESH': @@ -238,7 +238,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): split.label(text="Mesh:") split.prop(ob.data, "texco_mesh", text="") """ - elif tex.texture_coordinates == 'UV': + elif tex.texture_coords == 'UV': split = layout.split(percentage=0.3) split.label(text="Layer:") ob = context.object @@ -247,7 +247,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): else: split.prop(tex, "uv_layer", text="") - elif tex.texture_coordinates == 'OBJECT': + elif tex.texture_coords == 'OBJECT': split = layout.split(percentage=0.3) split.label(text="Object:") split.prop(tex, "object", text="") @@ -269,18 +269,18 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): split = layout.split() col = split.column() - if tex.texture_coordinates in ('ORCO', 'UV'): - col.prop(tex, "from_dupli") - elif tex.texture_coordinates == 'OBJECT': - col.prop(tex, "from_original") + if tex.texture_coords in ('ORCO', 'UV'): + col.prop(tex, "use_from_dupli") + elif tex.texture_coords == 'OBJECT': + col.prop(tex, "use_from_original") else: col.label() col = split.column() row = col.row() - row.prop(tex, "x_mapping", text="") - row.prop(tex, "y_mapping", text="") - row.prop(tex, "z_mapping", text="") + row.prop(tex, "mapping_x", text="") + row.prop(tex, "mapping_y", text="") + row.prop(tex, "mapping_z", text="") split = layout.split() @@ -330,66 +330,66 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): col = split.column() col.label(text="Diffuse:") - factor_but(col, tex.map_diffuse, "map_diffuse", "diffuse_factor", "Intensity") - factor_but(col, tex.map_colordiff, "map_colordiff", "colordiff_factor", "Color") - factor_but(col, tex.map_alpha, "map_alpha", "alpha_factor", "Alpha") - factor_but(col, tex.map_translucency, "map_translucency", "translucency_factor", "Translucency") + factor_but(col, tex.use_map_diffuse, "use_map_diffuse", "diffuse_factor", "Intensity") + factor_but(col, tex.use_map_color_diff, "use_map_color_diff", "diffuse_color_factor", "Color") + factor_but(col, tex.use_map_alpha, "use_map_alpha", "alpha_factor", "Alpha") + factor_but(col, tex.use_map_translucency, "use_map_translucency", "translucency_factor", "Translucency") col.label(text="Specular:") - factor_but(col, tex.map_specular, "map_specular", "specular_factor", "Intensity") - factor_but(col, tex.map_colorspec, "map_colorspec", "colorspec_factor", "Color") - factor_but(col, tex.map_hardness, "map_hardness", "hardness_factor", "Hardness") + factor_but(col, tex.use_map_specular, "use_map_specular", "specular_factor", "Intensity") + factor_but(col, tex.use_map_color_spec, "use_map_color_spec", "specular_color_factor", "Color") + factor_but(col, tex.use_map_hardness, "use_map_hardness", "hardness_factor", "Hardness") col = split.column() col.label(text="Shading:") - factor_but(col, tex.map_ambient, "map_ambient", "ambient_factor", "Ambient") - factor_but(col, tex.map_emit, "map_emit", "emit_factor", "Emit") - factor_but(col, tex.map_mirror, "map_mirror", "mirror_factor", "Mirror") - factor_but(col, tex.map_raymir, "map_raymir", "raymir_factor", "Ray Mirror") + factor_but(col, tex.use_map_ambient, "use_map_ambient", "ambient_factor", "Ambient") + factor_but(col, tex.use_map_emit, "use_map_emit", "emit_factor", "Emit") + factor_but(col, tex.use_map_mirror, "use_map_mirror", "mirror_factor", "Mirror") + factor_but(col, tex.use_map_raymir, "use_map_raymir", "raymir_factor", "Ray Mirror") col.label(text="Geometry:") # XXX replace 'or' when displacement is fixed to not rely on normal influence value. - factor_but(col, (tex.map_normal or tex.map_displacement), "map_normal", "normal_factor", "Normal") - factor_but(col, tex.map_warp, "map_warp", "warp_factor", "Warp") - factor_but(col, tex.map_displacement, "map_displacement", "displacement_factor", "Displace") + factor_but(col, (tex.use_map_normal or tex.use_map_displacement), "use_map_normal", "normal_factor", "Normal") + factor_but(col, tex.use_map_warp, "use_map_warp", "warp_factor", "Warp") + factor_but(col, tex.use_map_displacement, "use_map_displacement", "displacement_factor", "Displace") #sub = col.column() - #sub.active = tex.map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror + #sub.active = tex.use_map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror #sub.prop(tex, "default_value", text="Amount", slider=True) elif idblock.type == 'VOLUME': split = layout.split() col = split.column() - factor_but(col, tex.map_density, "map_density", "density_factor", "Density") - factor_but(col, tex.map_emission, "map_emission", "emission_factor", "Emission") - factor_but(col, tex.map_scattering, "map_scattering", "scattering_factor", "Scattering") - factor_but(col, tex.map_reflection, "map_reflection", "reflection_factor", "Reflection") + factor_but(col, tex.use_map_density, "use_map_density", "density_factor", "Density") + factor_but(col, tex.use_map_emission, "use_map_emission", "emission_factor", "Emission") + factor_but(col, tex.use_map_scatter, "use_map_scattering", "scattering_factor", "Scattering") + factor_but(col, tex.use_map_reflect, "use_map_reflection", "reflection_factor", "Reflection") col = split.column() col.label(text=" ") - factor_but(col, tex.map_coloremission, "map_coloremission", "coloremission_factor", "Emission Color") - factor_but(col, tex.map_colortransmission, "map_colortransmission", "colortransmission_factor", "Transmission Color") - factor_but(col, tex.map_colorreflection, "map_colorreflection", "colorreflection_factor", "Reflection Color") + factor_but(col, tex.use_map_color_emission, "use_map_color_emission", "emission_color_factor", "Emission Color") + factor_but(col, tex.use_map_color_transmission, "use_map_color_transmission", "transmission_color_factor", "Transmission Color") + factor_but(col, tex.use_map_color_reflection, "use_map_color_reflection", "reflection_color_factor", "Reflection Color") elif type(idblock) == bpy.types.Lamp: split = layout.split() col = split.column() - factor_but(col, tex.map_color, "map_color", "color_factor", "Color") + factor_but(col, tex.use_map_color, "map_color", "color_factor", "Color") col = split.column() - factor_but(col, tex.map_shadow, "map_shadow", "shadow_factor", "Shadow") + factor_but(col, tex.use_map_shadow, "map_shadow", "shadow_factor", "Shadow") elif type(idblock) == bpy.types.World: split = layout.split() col = split.column() - factor_but(col, tex.map_blend, "map_blend", "blend_factor", "Blend") - factor_but(col, tex.map_horizon, "map_horizon", "horizon_factor", "Horizon") + factor_but(col, tex.use_map_blend, "map_blend", "blend_factor", "Blend") + factor_but(col, tex.use_map_horizon, "map_horizon", "horizon_factor", "Horizon") col = split.column() - factor_but(col, tex.map_zenith_up, "map_zenith_up", "zenith_up_factor", "Zenith Up") - factor_but(col, tex.map_zenith_down, "map_zenith_down", "zenith_down_factor", "Zenith Down") + factor_but(col, tex.use_map_zenith_up, "map_zenith_up", "zenith_up_factor", "Zenith Up") + factor_but(col, tex.use_map_zenith_down, "map_zenith_down", "zenith_down_factor", "Zenith Down") layout.separator() @@ -397,14 +397,14 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): col = split.column() col.prop(tex, "blend_type", text="Blend") - col.prop(tex, "rgb_to_intensity") + col.prop(tex, "use_rgb_to_intensity") sub = col.column() - sub.active = tex.rgb_to_intensity + sub.active = tex.use_rgb_to_intensity sub.prop(tex, "color", text="") col = split.column() col.prop(tex, "negate", text="Negative") - col.prop(tex, "stencil") + col.prop(tex, "use_stencil") if type(idblock) in (bpy.types.Material, bpy.types.World): col.prop(tex, "default_value", text="DVar", slider=True) @@ -439,7 +439,7 @@ class TEXTURE_PT_clouds(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col.prop(tex, "noise_depth", text="Depth") col = split.column() @@ -456,7 +456,7 @@ class TEXTURE_PT_wood(TextureTypePanel, bpy.types.Panel): tex = context.texture - layout.prop(tex, "noisebasis2", expand=True) + layout.prop(tex, "noisebasis_2", expand=True) layout.prop(tex, "stype", expand=True) col = layout.column() @@ -469,7 +469,7 @@ class TEXTURE_PT_wood(TextureTypePanel, bpy.types.Panel): split.active = tex.stype in ('RINGNOISE', 'BANDNOISE') col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col.prop(tex, "turbulence") col = split.column() @@ -487,7 +487,7 @@ class TEXTURE_PT_marble(TextureTypePanel, bpy.types.Panel): tex = context.texture layout.prop(tex, "stype", expand=True) - layout.prop(tex, "noisebasis2", expand=True) + layout.prop(tex, "noisebasis_2", expand=True) layout.label(text="Noise:") layout.prop(tex, "noise_type", text="Type", expand=True) layout.prop(tex, "noise_basis", text="Basis") @@ -495,7 +495,7 @@ class TEXTURE_PT_marble(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col.prop(tex, "noise_depth", text="Depth") col = split.column() @@ -537,7 +537,7 @@ class TEXTURE_PT_blend(TextureTypePanel, bpy.types.Panel): sub = layout.row() sub.active = (tex.progression in ('LINEAR', 'QUADRATIC', 'EASING', 'RADIAL')) - sub.prop(tex, "flip_axis", expand=True) + sub.prop(tex, "use_flip_axis", expand=True) class TEXTURE_PT_stucci(TextureTypePanel, bpy.types.Panel): @@ -558,7 +558,7 @@ class TEXTURE_PT_stucci(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "turbulence") @@ -587,7 +587,7 @@ def texture_filter_common(tex, layout): layout.prop(tex, "filter_eccentricity", text="Eccentricity") layout.prop(tex, "filter_size") - layout.prop(tex, "filter_size_minimum") + layout.prop(tex, "use_filter_size_min") class TEXTURE_PT_image_sampling(TextureTypePanel, bpy.types.Panel): @@ -607,22 +607,22 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, bpy.types.Panel): col = split.column() col.label(text="Alpha:") col.prop(tex, "use_alpha", text="Use") - col.prop(tex, "calculate_alpha", text="Calculate") + col.prop(tex, "use_calculate_alpha", text="Calculate") col.prop(tex, "invert_alpha", text="Invert") col.separator() - col.prop(tex, "flip_axis", text="Flip X/Y Axis") + col.prop(tex, "use_flip_axis", text="Flip X/Y Axis") col = split.column() - col.prop(tex, "normal_map") + col.prop(tex, "use_normal_map") row = col.row() - row.active = tex.normal_map + row.active = tex.use_normal_map row.prop(tex, "normal_space", text="") col.prop(tex, "mipmap") row = col.row() row.active = tex.mipmap - row.prop(tex, "mipmap_gauss") + row.prop(tex, "use_mipmap_gauss") col.prop(tex, "interpolation") texture_filter_common(tex, col) @@ -651,15 +651,15 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, bpy.types.Panel): col = split.column(align=True) col.label(text="Mirror:") - col.prop(tex, "mirror_x", text="X") - col.prop(tex, "mirror_y", text="Y") + col.prop(tex, "use_mirror_x", text="X") + col.prop(tex, "use_mirror_y", text="Y") layout.separator() elif tex.extension == 'CHECKER': col = split.column(align=True) row = col.row() - row.prop(tex, "checker_even", text="Even") - row.prop(tex, "checker_odd", text="Odd") + row.prop(tex, "use_checker_even", text="Even") + row.prop(tex, "use_checker_odd", text="Odd") col = split.column() col.prop(tex, "checker_distance", text="Distance") @@ -748,7 +748,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "highest_dimension", text="Dimension") + col.prop(tex, "dimension_max", text="Dimension") col.prop(tex, "lacunarity") col.prop(tex, "octaves") @@ -766,7 +766,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "nabla") @@ -791,7 +791,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel, bpy.types.Panel): sub.active = tex.distance_metric == 'MINKOVSKY' sub.prop(tex, "minkovsky_exponent", text="Exponent") col.label(text="Coloring:") - col.prop(tex, "coloring", text="") + col.prop(tex, "color_mode", text="") col.prop(tex, "noise_intensity", text="Intensity") col = split.column() @@ -807,7 +807,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "nabla") @@ -830,7 +830,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel, bpy.types.Panel): col = split.column() col.prop(tex, "distortion", text="Distortion") - col.prop(tex, "noise_size", text="Size") + col.prop(tex, "noise_scale", text="Size") col = split.column() col.prop(tex, "nabla") @@ -854,7 +854,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel): layout.prop(vd, "file_format") if vd.file_format in ('BLENDER_VOXEL', 'RAW_8BIT'): - layout.prop(vd, "source_path") + layout.prop(vd, "filepath") if vd.file_format == 'RAW_8BIT': layout.prop(vd, "resolution") elif vd.file_format == 'SMOKE': @@ -868,7 +868,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel): layout.prop(vd, "still") row = layout.row() row.active = vd.still - row.prop(vd, "still_frame_number") + row.prop(vd, "still_frame") layout.prop(vd, "interpolation") layout.prop(vd, "extension") @@ -906,12 +906,12 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): sub.label(text="System:") sub.prop_object(pd, "particle_system", pd.object, "particle_systems", text="") sub.label(text="Cache:") - sub.prop(pd, "particle_cache", text="") + sub.prop(pd, "particle_cache_space", text="") else: col.label(text="Object:") col.prop(pd, "object", text="") col.label(text="Cache:") - col.prop(pd, "vertices_cache", text="") + col.prop(pd, "vertex_cache_space", text="") col.separator() @@ -928,7 +928,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): col.label(text="Falloff:") col.prop(pd, "falloff", text="") if pd.falloff == 'SOFT': - col.prop(pd, "falloff_softness") + col.prop(pd, "falloff_soft") class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): @@ -947,14 +947,14 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): tex = context.texture pd = tex.point_density - layout.prop(pd, "turbulence", text="") + layout.prop(pd, "use_turbulence", text="") def draw(self, context): layout = self.layout tex = context.texture pd = tex.point_density - layout.active = pd.turbulence + layout.active = pd.use_turbulence split = layout.split() @@ -966,7 +966,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): col = split.column() col.label() - col.prop(pd, "turbulence_size") + col.prop(pd, "turbulence_scale") col.prop(pd, "turbulence_depth") col.prop(pd, "turbulence_strength") diff --git a/release/scripts/ui/properties_world.py b/release/scripts/ui/properties_world.py index bb5758ff902..f9906fa628e 100644 --- a/release/scripts/ui/properties_world.py +++ b/release/scripts/ui/properties_world.py @@ -78,15 +78,15 @@ class WORLD_PT_world(WorldButtonsPanel, bpy.types.Panel): world = context.world row = layout.row() - row.prop(world, "paper_sky") - row.prop(world, "blend_sky") - row.prop(world, "real_sky") + row.prop(world, "use_sky_paper") + row.prop(world, "use_sky_blend") + row.prop(world, "use_sky_real") row = layout.row() row.column().prop(world, "horizon_color") col = row.column() col.prop(world, "zenith_color") - col.active = world.blend_sky + col.active = world.use_sky_blend row.column().prop(world, "ambient_color") @@ -106,7 +106,7 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel, bpy.types.Panel): split = layout.split() split.prop(light, "ao_factor", text="Factor") - split.prop(light, "ao_blend_mode", text="") + split.prop(light, "ao_blend_type", text="") class WORLD_PT_environment_lighting(WorldButtonsPanel, bpy.types.Panel): @@ -115,13 +115,13 @@ class WORLD_PT_environment_lighting(WorldButtonsPanel, bpy.types.Panel): def draw_header(self, context): light = context.world.lighting - self.layout.prop(light, "use_environment_lighting", text="") + self.layout.prop(light, "use_environment_light", text="") def draw(self, context): layout = self.layout light = context.world.lighting - layout.active = light.use_environment_lighting + layout.active = light.use_environment_light split = layout.split() split.prop(light, "environment_energy", text="Energy") @@ -139,13 +139,13 @@ class WORLD_PT_indirect_lighting(WorldButtonsPanel, bpy.types.Panel): def draw_header(self, context): light = context.world.lighting - self.layout.prop(light, "use_indirect_lighting", text="") + self.layout.prop(light, "use_indirect_light", text="") def draw(self, context): layout = self.layout light = context.world.lighting - layout.active = light.use_indirect_lighting + layout.active = light.use_indirect_light split = layout.split() split.prop(light, "indirect_factor", text="Factor") @@ -160,7 +160,7 @@ class WORLD_PT_gather(WorldButtonsPanel, bpy.types.Panel): layout = self.layout light = context.world.lighting - layout.active = light.use_ambient_occlusion or light.use_environment_lighting or light.use_indirect_lighting + layout.active = light.use_ambient_occlusion or light.use_environment_light or light.use_indirect_light layout.prop(light, "gather_method", expand=True) @@ -195,8 +195,8 @@ class WORLD_PT_gather(WorldButtonsPanel, bpy.types.Panel): col.label(text="Sampling:") col.prop(light, "passes") - col.prop(light, "error_tolerance", text="Error") - col.prop(light, "pixel_cache") + col.prop(light, "error_threshold", text="Error") + col.prop(light, "use_cache") col.prop(light, "correction") @@ -249,10 +249,10 @@ class WORLD_PT_stars(WorldButtonsPanel, bpy.types.Panel): col = split.column() col.prop(world.stars, "size") - col.prop(world.stars, "color_randomization", text="Colors") + col.prop(world.stars, "color_random", text="Colors") col = split.column() - col.prop(world.stars, "min_distance", text="Min. Dist") + col.prop(world.stars, "distance_min", text="Min. Dist") col.prop(world.stars, "average_separation", text="Separation") diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index bcb227b55ec..891637e7121 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -381,24 +381,24 @@ class IMAGE_PT_game_properties(bpy.types.Panel): col = split.column() sub = col.column(align=True) - sub.prop(ima, "animated") + sub.prop(ima, "use_animation") subsub = sub.column() - subsub.active = ima.animated - subsub.prop(ima, "animation_start", text="Start") - subsub.prop(ima, "animation_end", text="End") - subsub.prop(ima, "animation_speed", text="Speed") + subsub.active = ima.use_animation + subsub.prop(ima, "frame_start", text="Start") + subsub.prop(ima, "frame_end", text="End") + subsub.prop(ima, "fps", text="Speed") col.prop(ima, "tiles") sub = col.column(align=True) - sub.active = ima.tiles or ima.animated + sub.active = ima.tiles or ima.use_animation sub.prop(ima, "tiles_x", text="X") sub.prop(ima, "tiles_y", text="Y") col = split.column() col.label(text="Clamp:") - col.prop(ima, "clamp_x", text="X") - col.prop(ima, "clamp_y", text="Y") + col.prop(ima, "use_clamp_x", text="X") + col.prop(ima, "use_clamp_y", text="Y") col.separator() col.prop(ima, "mapping", expand=True) diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index 62c021354db..500e80fe120 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -277,7 +277,7 @@ class INFO_MT_game(bpy.types.Menu): layout.prop(gs, "use_deprecation_warnings") layout.prop(gs, "use_animation_record") layout.separator() - layout.prop(gs, "auto_start") + layout.prop(gs, "use_auto_start") class INFO_MT_render(bpy.types.Menu): diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index a331e747fdb..1906f3312e1 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -358,12 +358,12 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.3) split.label(text="Blend:") - split.prop(strip, "blend_mode", text="") + split.prop(strip, "blend_type", text="") row = layout.row(align=True) sub = row.row() sub.active = (not strip.mute) - sub.prop(strip, "blend_opacity", text="Opacity", slider=True) + sub.prop(strip, "blend_alpha", text="Opacity", slider=True) row.prop(strip, "mute", toggle=True, icon='RESTRICT_VIEW_ON' if strip.mute else 'RESTRICT_VIEW_OFF', text="") row.prop(strip, "lock", toggle=True, icon='LOCKED' if strip.lock else 'UNLOCKED', text="") @@ -372,11 +372,11 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, bpy.types.Panel): sub.enabled = not strip.lock sub.prop(strip, "channel") sub.prop(strip, "frame_start") - sub.prop(strip, "frame_final_length") + sub.prop(strip, "frame_final_duration") col = layout.column(align=True) row = col.row() - row.label(text="Final Length: %s" % bpy.utils.smpte_from_frame(strip.frame_final_length)) + row.label(text="Final Length: %s" % bpy.utils.smpte_from_frame(strip.frame_final_duration)) row = col.row() row.active = (frame_current >= strip.frame_start and frame_current <= strip.frame_start + strip.frame_duration) row.label(text="Playhead: %d" % (frame_current - strip.frame_start)) @@ -428,19 +428,19 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, bpy.types.Panel): flow.prop(strip, "threshold", slider=True) flow.prop(strip, "clamp", slider=True) flow.prop(strip, "boost_factor") - flow.prop(strip, "blur_distance") + flow.prop(strip, "blur_radius") row = layout.row() row.prop(strip, "quality", slider=True) - row.prop(strip, "only_boost") + row.prop(strip, "use_only_boost") elif strip.type == 'SPEED': layout.prop(strip, "global_speed") flow = layout.column_flow() - flow.prop(strip, "curve_velocity") - flow.prop(strip, "curve_compress_y") - flow.prop(strip, "frame_blending") + flow.prop(strip, "use_curve_velocity") + flow.prop(strip, "use_curve_compress_y") + flow.prop(strip, "use_frame_blend") elif strip.type == 'TRANSFORM': self.draw_panel_transform(strip) @@ -463,8 +463,8 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, bpy.types.Panel): if strip.type == 'SPEED': col.prop(strip, "speed_fader", text="Speed fader") elif strip.type in ('CROSS', 'GAMMA_CROSS', 'PLUGIN', 'WIPE'): - col.prop(strip, "use_effect_default_fade", "Default fade") - if not strip.use_effect_default_fade: + col.prop(strip, "use_default_fade", "Default fade") + if not strip.use_default_fade: col.prop(strip, "effect_fader", text="Effect fader") layout.prop(strip, "use_translation", text="Image Offset:") @@ -495,8 +495,8 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, bpy.types.Panel): layout.separator() col = layout.column(align=True) - col.prop(strip, "uniform_scale") - if (strip.uniform_scale): + col.prop(strip, "use_uniform_scale") + if (strip.use_uniform_scale): col = layout.column(align=True) col.prop(strip, "scale_start_x", text="Scale") else: @@ -624,8 +624,8 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, bpy.types.Panel): col = layout.column(align=True) col.label(text="Trim Duration:") - col.prop(strip, "animation_start_offset", text="Start") - col.prop(strip, "animation_end_offset", text="End") + col.prop(strip, "animation_offset_start", text="Start") + col.prop(strip, "animation_offset_end", text="End") class SEQUENCER_PT_scene(SequencerButtonsPanel, bpy.types.Panel): @@ -683,19 +683,19 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, bpy.types.Panel): row = layout.row() row.label(text="Flip:") - row.prop(strip, "flip_x", text="X") - row.prop(strip, "flip_y", text="Y") + row.prop(strip, "use_flip_x", text="X") + row.prop(strip, "use_flip_y", text="Y") col = layout.column() - col.prop(strip, "reverse_frames", text="Backwards") - col.prop(strip, "de_interlace") + col.prop(strip, "use_reverse_frames", text="Backwards") + col.prop(strip, "use_deinterlace") col = layout.column() col.label(text="Colors:") col.prop(strip, "color_saturation", text="Saturation") - col.prop(strip, "multiply_colors", text="Multiply") - col.prop(strip, "premultiply") - col.prop(strip, "convert_float") + col.prop(strip, "color_multiply", text="Multiply") + col.prop(strip, "use_premultiply") + col.prop(strip, "use_float") layout.prop(strip, "use_color_balance") if strip.use_color_balance and strip.color_balance: # TODO - need to add this somehow @@ -704,15 +704,15 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, bpy.types.Panel): col = row.column() col.template_color_wheel(strip.color_balance, "lift", value_slider=False, cubic=True) col.row().prop(strip.color_balance, "lift") - col.prop(strip.color_balance, "inverse_lift", text="Inverse") + col.prop(strip.color_balance, "invert_lift", text="Inverse") col = row.column() col.template_color_wheel(strip.color_balance, "gamma", value_slider=False, lock_luminosity=True, cubic=True) col.row().prop(strip.color_balance, "gamma") - col.prop(strip.color_balance, "inverse_gamma", text="Inverse") + col.prop(strip.color_balance, "invert_gamma", text="Inverse") col = row.column() col.template_color_wheel(strip.color_balance, "gain", value_slider=False, lock_luminosity=True, cubic=True) col.row().prop(strip.color_balance, "gain") - col.prop(strip.color_balance, "inverse_gain", text="Inverse") + col.prop(strip.color_balance, "invert_gain", text="Inverse") class SEQUENCER_PT_proxy(SequencerButtonsPanel, bpy.types.Panel): @@ -740,12 +740,12 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, bpy.types.Panel): strip = act_strip(context) flow = layout.column_flow() - flow.prop(strip, "proxy_custom_directory") - flow.prop(strip, "proxy_custom_file") + flow.prop(strip, "use_proxy_custom_directory") + flow.prop(strip, "use_proxy_custom_file") if strip.proxy: # TODO - need to add this somehow - if strip.proxy_custom_directory and not strip.proxy_custom_file: + if strip.proxy_custom_directory and not strip.use_proxy_custom_file: flow.prop(strip.proxy, "directory") - if strip.proxy_custom_file: + if strip.use_proxy_custom_file: flow.prop(strip.proxy, "filepath") diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py index f966f8a7e8b..5536be0586c 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -152,7 +152,7 @@ class InputKeyMapPanel(bpy.types.Panel): indentpx = 16 if level == 0: level = 0.0001 # Tweak so that a percentage of 0 won't split by half - indent = level * indentpx / bpy.context.region.width + indent = level * indentpx / bpy.context.region.offset split = layout.split(percentage=indent) col = split.column() diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 2dc4b9cfabb..428a840b4f7 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -68,7 +68,7 @@ class VIEW3D_HT_header(bpy.types.Header): if obj: # Particle edit if obj.mode == 'PARTICLE_EDIT': - row.prop(toolsettings.particle_edit, "selection_mode", text="", expand=True, toggle=True) + row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True, toggle=True) # Occlude geometry if view.viewport_shade in ('SOLID', 'SHADED', 'TEXTURED') and (obj.mode == 'PARTICLE_EDIT' or (obj.mode == 'EDIT' and obj.type == 'MESH')): @@ -748,7 +748,7 @@ class VIEW3D_MT_object_specials(bpy.types.Menu): props = layout.operator("wm.context_modal_mouse", text="Width Size") props.data_path_iter = "selected_editable_objects" - props.data_path_item = "data.width" + props.data_path_item = "data.offset" props.input_scale = 0.01 if obj.type == 'EMPTY': @@ -1063,7 +1063,7 @@ class VIEW3D_MT_particle(bpy.types.Menu): layout.operator("particle.remove_doubles") layout.operator("particle.delete") - if particle_edit.selection_mode == 'POINT': + if particle_edit.select_mode == 'POINT': layout.operator("particle.subdivide") layout.operator("particle.rekey") @@ -1084,7 +1084,7 @@ class VIEW3D_MT_particle_specials(bpy.types.Menu): layout.operator("particle.rekey") layout.separator() - if particle_edit.selection_mode == 'POINT': + if particle_edit.select_mode == 'POINT': layout.operator("particle.subdivide") layout.operator("particle.select_roots") layout.operator("particle.select_tips") @@ -1108,7 +1108,7 @@ class VIEW3D_MT_pose(bpy.types.Menu): layout.menu("VIEW3D_MT_transform") layout.menu("VIEW3D_MT_snap") - if arm.drawtype in ('BBONE', 'ENVELOPE'): + if arm.draw_type in ('BBONE', 'ENVELOPE'): layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONESIZE' layout.menu("VIEW3D_MT_pose_transform") @@ -1843,7 +1843,7 @@ class VIEW3D_MT_edit_armature(bpy.types.Menu): layout.menu("VIEW3D_MT_snap") layout.menu("VIEW3D_MT_edit_armature_roll") - if arm.drawtype == 'ENVELOPE': + if arm.draw_type == 'ENVELOPE': layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONESIZE' else: layout.operator("transform.transform", text="Scale B-Bone Width").mode = 'BONESIZE' @@ -1852,7 +1852,7 @@ class VIEW3D_MT_edit_armature(bpy.types.Menu): layout.operator("armature.extrude_move") - if arm.x_axis_mirror: + if arm.use_mirror_x: layout.operator("armature.extrude_forked") layout.operator("armature.duplicate_move") @@ -2167,7 +2167,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel): if (bg.image): box.template_image(bg, "image", bg.image_user, compact=True) - box.prop(bg, "transparency", slider=True) + box.prop(bg, "use_transparency", slider=True) if bg.view_axis != 'CAMERA': box.prop(bg, "size") row = box.row(align=True) diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index f99044281b5..e47dbceed8f 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -339,7 +339,7 @@ class VIEW3D_PT_tools_armatureedit_options(View3DPanel, bpy.types.Panel): arm = context.active_object.data col = layout.column(align=True) - col.prop(arm, "x_axis_mirror") + col.prop(arm, "use_mirror_x") # ********** default tools for editmode_mball **************** @@ -462,8 +462,8 @@ class VIEW3D_PT_tools_posemode_options(View3DPanel, bpy.types.Panel): arm = context.active_object.data col = layout.column(align=True) - col.prop(arm, "x_axis_mirror") - col.prop(arm, "auto_ik") + col.prop(arm, "use_mirror_x") + col.prop(arm, "use_auto_ik") # ********** default tools for paint modes **************** @@ -523,11 +523,11 @@ class VIEW3D_PT_tools_brush(PaintPanel, bpy.types.Panel): if settings.tool == 'ADD': col.prop(brush, "count") col = layout.column() - col.prop(settings, "add_interpolate") + col.prop(settings, "use_default_interpolate") sub = col.column(align=True) - sub.active = settings.add_interpolate + sub.active = settings.use_default_interpolate sub.prop(brush, "steps", slider=True) - sub.prop(settings, "add_keys", slider=True) + sub.prop(settings, "default_key_count", slider=True) elif settings.tool == 'LENGTH': layout.prop(brush, "length_mode", expand=True) elif settings.tool == 'PUFF': @@ -1116,9 +1116,9 @@ class VIEW3D_PT_tools_weightpaint_options(View3DPanel, bpy.types.Panel): wpaint = tool_settings.weight_paint col = layout.column() - col.prop(wpaint, "all_faces") + col.prop(wpaint, "use_all_faces") col.prop(wpaint, "normals") - col.prop(wpaint, "spray") + col.prop(wpaint, "use_spray") obj = context.weight_paint_object if obj.type == 'MESH': @@ -1154,9 +1154,9 @@ class VIEW3D_PT_tools_vertexpaint(View3DPanel, bpy.types.Panel): col = layout.column() #col.prop(vpaint, "mode", text="") - col.prop(vpaint, "all_faces") + col.prop(vpaint, "use_all_faces") col.prop(vpaint, "normals") - col.prop(vpaint, "spray") + col.prop(vpaint, "use_spray") col.label(text="Unified Settings:") col.prop(tool_settings, "sculpt_paint_use_unified_size", text="Size") @@ -1319,19 +1319,19 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, bpy.types.Panel): col = layout.column(align=True) if pe.is_hair: col.active = pe.is_editable - col.prop(pe, "emitter_deflect", text="Deflect emitter") + col.prop(pe, "use_emitter_deflect", text="Deflect emitter") sub = col.row() - sub.active = pe.emitter_deflect + sub.active = pe.use_emitter_deflect sub.prop(pe, "emitter_distance", text="Distance") col = layout.column(align=True) col.active = pe.is_editable col.label(text="Keep:") - col.prop(pe, "keep_lengths", text="Lengths") - col.prop(pe, "keep_root", text="Root") + col.prop(pe, "use_preserve_length", text="Lengths") + col.prop(pe, "use_preserve_root", text="Root") if not pe.is_hair: col.label(text="Correct:") - col.prop(pe, "auto_velocity", text="Velocity") + col.prop(pe, "use_auto_velocity", text="Velocity") col.prop(ob.data, "use_mirror_x") col = layout.column(align=True) @@ -1343,9 +1343,9 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, bpy.types.Panel): else: if pe.type == 'PARTICLES': col.prop(pe, "show_particles", text="Particles") - col.prop(pe, "fade_time") + col.prop(pe, "use_fade_time") sub = col.row() - sub.active = pe.fade_time + sub.active = pe.use_fade_time sub.prop(pe, "fade_frames", slider=True) diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 8ad768f2658..ca1a80110f3 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -1587,7 +1587,7 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; make_prim_ext(C, loc, rot, enter_editmode, layer, - PRIM_UVSPHERE, RNA_int_get(op->ptr, "rings"), + PRIM_UVSPHERE, RNA_int_get(op->ptr, "ring_count"), RNA_int_get(op->ptr, "segments"), 0, RNA_float_get(op->ptr,"size"), 0.0f, 0, 0); @@ -1611,7 +1611,7 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) /* props */ RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, "Segments", "", 3, 500); - RNA_def_int(ot->srna, "rings", 16, INT_MIN, INT_MAX, "Rings", "", 3, 500); + RNA_def_int(ot->srna, "ring_count", 16, INT_MIN, INT_MAX, "Rings", "", 3, 500); RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00); ED_object_add_generic_props(ot, TRUE); diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 3daacd8f68e..c96306dde14 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1748,10 +1748,10 @@ static int area_join_init(bContext *C, wmOperator *op) int x2, y2; /* required properties, make negative to get return 0 if not set by caller */ - x1= RNA_int_get(op->ptr, "x1"); - y1= RNA_int_get(op->ptr, "y1"); - x2= RNA_int_get(op->ptr, "x2"); - y2= RNA_int_get(op->ptr, "y2"); + x1= RNA_int_get(op->ptr, "min_x"); + y1= RNA_int_get(op->ptr, "min_y"); + x2= RNA_int_get(op->ptr, "max_x"); + y2= RNA_int_get(op->ptr, "max_y"); sa1 = screen_areahascursor(CTX_wm_screen(C), x1, y1); sa2 = screen_areahascursor(CTX_wm_screen(C), x2, y2); @@ -1832,10 +1832,10 @@ static int area_join_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_PASS_THROUGH; /* prepare operator state vars */ - RNA_int_set(op->ptr, "x1", sad->x); - RNA_int_set(op->ptr, "y1", sad->y); - RNA_int_set(op->ptr, "x2", event->x); - RNA_int_set(op->ptr, "y2", event->y); + RNA_int_set(op->ptr, "min_x", sad->x); + RNA_int_set(op->ptr, "min_y", sad->y); + RNA_int_set(op->ptr, "max_x", event->x); + RNA_int_set(op->ptr, "max_y", event->y); if(!area_join_init(C, op)) return OPERATOR_PASS_THROUGH; @@ -1977,10 +1977,10 @@ static void SCREEN_OT_area_join(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; /* rna */ - RNA_def_int(ot->srna, "x1", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "y1", -100, INT_MIN, INT_MAX, "Y 1", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "x2", -100, INT_MIN, INT_MAX, "X 2", "", INT_MIN, INT_MAX); - RNA_def_int(ot->srna, "y2", -100, INT_MIN, INT_MAX, "Y 2", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "min_x", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "min_y", -100, INT_MIN, INT_MAX, "Y 1", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "max_x", -100, INT_MIN, INT_MAX, "X 2", "", INT_MIN, INT_MAX); + RNA_def_int(ot->srna, "max_y", -100, INT_MIN, INT_MAX, "Y 2", "", INT_MIN, INT_MAX); } /* ************** repeat last operator ***************************** */ diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 06ed4d61657..4f9163bc32c 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -884,7 +884,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn uiLayoutSetActive(row, RNA_boolean_get(&imaptr, "use_fields")); col= uiLayoutColumn(split, 0); - uiItemR(col, &imaptr, "premultiply", 0, NULL, 0); + uiItemR(col, &imaptr, "use_premultiply", 0, NULL, 0); } } @@ -909,7 +909,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn col= uiLayoutColumn(split, 0); uiItemR(col, userptr, "fields_per_frame", 0, "Fields", 0); - uiItemR(col, userptr, "auto_refresh", 0, NULL, 0); + uiItemR(col, userptr, "use_auto_refresh", 0, NULL, 0); uiItemR(col, userptr, "cyclic", 0, NULL, 0); } else if(ima->source==IMA_SRC_GENERATED) { diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 6ff9922c555..5ad21f7c9ca 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -293,23 +293,23 @@ static void nla_panel_properties(const bContext *C, Panel *pa) /* blending */ row= uiLayoutRow(layout, 1); - uiItemR(row, &strip_ptr, "blending", 0, NULL, 0); + uiItemR(row, &strip_ptr, "blend_type", 0, NULL, 0); /* blend in/out + autoblending * - blend in/out can only be set when autoblending is off */ column= uiLayoutColumn(layout, 1); - uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_influence")==0); - uiItemR(column, &strip_ptr, "auto_blending", 0, NULL, 0); // XXX as toggle? + uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_influence")==0); + uiItemR(column, &strip_ptr, "use_auto_blend", 0, NULL, 0); // XXX as toggle? subcol= uiLayoutColumn(column, 1); - uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "auto_blending")==0); + uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "use_auto_blend")==0); uiItemR(subcol, &strip_ptr, "blend_in", 0, NULL, 0); uiItemR(subcol, &strip_ptr, "blend_out", 0, NULL, 0); /* settings */ column= uiLayoutColumn(layout, 1); - uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "animated_time"))); + uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "use_animated_time"))); uiItemL(column, "Playback Settings:", 0); uiItemR(column, &strip_ptr, "mute", 0, NULL, 0); uiItemR(column, &strip_ptr, "reversed", 0, NULL, 0); @@ -346,7 +346,7 @@ static void nla_panel_actclip(const bContext *C, Panel *pa) /* action usage */ column= uiLayoutColumn(layout, 1); - uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "animated_time")==0); + uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_time")==0); uiItemL(column, "Playback Settings:", 0); uiItemR(column, &strip_ptr, "scale", 0, NULL, 0); uiItemR(column, &strip_ptr, "repeat", 0, NULL, 0); @@ -368,21 +368,21 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa) uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL); column= uiLayoutColumn(layout, 1); - uiItemR(column, &strip_ptr, "animated_influence", 0, NULL, 0); + uiItemR(column, &strip_ptr, "use_animated_influence", 0, NULL, 0); subcolumn= uiLayoutColumn(column, 1); - uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "animated_influence")); + uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "use_animated_influence")); uiItemR(subcolumn, &strip_ptr, "influence", 0, NULL, 0); column= uiLayoutColumn(layout, 1); subrow= uiLayoutRow(column, 0); - uiItemR(subrow, &strip_ptr, "animated_time", 0, NULL, 0); - uiItemR(subrow, &strip_ptr, "animated_time_cyclic", 0, NULL, 0); + uiItemR(subrow, &strip_ptr, "use_animated_time", 0, NULL, 0); + uiItemR(subrow, &strip_ptr, "use_animated_time_cyclic", 0, NULL, 0); subcolumn= uiLayoutColumn(column, 1); subrow= uiLayoutRow(subcolumn, 0); - uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "animated_time")); + uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "use_animated_time")); uiItemR(subcolumn, &strip_ptr, "strip_time", 0, NULL, 0); } diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index f04cefc6d2b..e3013cc2507 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -329,12 +329,12 @@ static void node_shader_buts_mapping(uiLayout *layout, bContext *C, PointerRNA * uiItemR(row, ptr, "scale", 0, "", 0); row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "clamp_minimum", 0, "Min", 0); - uiItemR(row, ptr, "minimum", 0, "", 0); + uiItemR(row, ptr, "use_min", 0, "Min", 0); + uiItemR(row, ptr, "min", 0, "", 0); row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "clamp_maximum", 0, "Max", 0); - uiItemR(row, ptr, "maximum", 0, "", 0); + uiItemR(row, ptr, "use_max", 0, "Max", 0); + uiItemR(row, ptr, "max", 0, "", 0); } @@ -482,7 +482,7 @@ static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA * uiItemR(col, ptr, "start", 0, NULL, 0); uiItemR(col, ptr, "offset", 0, NULL, 0); uiItemR(col, ptr, "cyclic", 0, NULL, 0); - uiItemR(col, ptr, "auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0); + uiItemR(col, ptr, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0); } col= uiLayoutColumn(layout, 0); @@ -543,8 +543,8 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *C, PointerRNA *p uiItemR(col, ptr, "factor_y", 0, "Y", 0); } else { - uiItemR(col, ptr, "sizex", 0, "X", 0); - uiItemR(col, ptr, "sizey", 0, "Y", 0); + uiItemR(col, ptr, "size_x", 0, "X", 0); + uiItemR(col, ptr, "size_y", 0, "Y", 0); } } @@ -591,13 +591,13 @@ static void node_composit_buts_defocus(uiLayout *layout, bContext *C, PointerRNA uiItemR(col, ptr, "bokeh", 0, "", 0); uiItemR(col, ptr, "angle", 0, NULL, 0); - uiItemR(layout, ptr, "gamma_correction", 0, NULL, 0); + uiItemR(layout, ptr, "use_gamma_correction", 0, NULL, 0); col = uiLayoutColumn(layout, 0); uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer")==1); uiItemR(col, ptr, "f_stop", 0, NULL, 0); - uiItemR(layout, ptr, "max_blur", 0, NULL, 0); + uiItemR(layout, ptr, "blur_max", 0, NULL, 0); uiItemR(layout, ptr, "threshold", 0, NULL, 0); col = uiLayoutColumn(layout, 0); @@ -637,7 +637,7 @@ static void node_composit_buts_glare(uiLayout *layout, bContext *C, PointerRNA * uiItemR(layout, ptr, "fade", UI_ITEM_R_SLIDER, NULL, 0); if (RNA_enum_get(ptr, "glare_type")== 0) - uiItemR(layout, ptr, "rotate_45", 0, NULL, 0); + uiItemR(layout, ptr, "use_rotate_45", 0, NULL, 0); } if (RNA_enum_get(ptr, "glare_type")== 1) { uiItemR(layout, ptr, "size", 0, NULL, 0); @@ -668,10 +668,10 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext *C, PointerRN uiLayout *col; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "projector", 0, NULL, 0); + uiItemR(col, ptr, "use_projector", 0, NULL, 0); col = uiLayoutColumn(col, 0); - uiLayoutSetActive(col, RNA_boolean_get(ptr, "projector")==0); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector")==0); uiItemR(col, ptr, "jitter", 0, NULL, 0); uiItemR(col, ptr, "fit", 0, NULL, 0); } @@ -686,8 +686,8 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext *C, PointerRNA col= uiLayoutColumn(layout, 1); uiItemL(col, "Speed:", 0); - uiItemR(col, ptr, "min_speed", 0, "Min", 0); - uiItemR(col, ptr, "max_speed", 0, "Max", 0); + uiItemR(col, ptr, "speed_min", 0, "Min", 0); + uiItemR(col, ptr, "speed_max", 0, "Max", 0); uiItemR(layout, ptr, "curved", 0, NULL, 0); } @@ -706,13 +706,13 @@ static void node_composit_buts_crop(uiLayout *layout, bContext *C, PointerRNA *p { uiLayout *col; - uiItemR(layout, ptr, "crop_size", 0, NULL, 0); + uiItemR(layout, ptr, "use_crop_size", 0, NULL, 0); col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "x1", 0, "Left", 0); - uiItemR(col, ptr, "x2", 0, "Right", 0); - uiItemR(col, ptr, "y1", 0, "Up", 0); - uiItemR(col, ptr, "y2", 0, "Down", 0); + uiItemR(col, ptr, "min_x", 0, "Left", 0); + uiItemR(col, ptr, "max_x", 0, "Right", 0); + uiItemR(col, ptr, "min_y", 0, "Up", 0); + uiItemR(col, ptr, "max_y", 0, "Down", 0); } static void node_composit_buts_splitviewer(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -751,7 +751,7 @@ static void node_composit_buts_alphaover(uiLayout *layout, bContext *C, PointerR uiLayout *col; col =uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "convert_premul", 0, NULL, 0); + uiItemR(col, ptr, "use_premultiply", 0, NULL, 0); uiItemR(col, ptr, "premul", 0, NULL, 0); } @@ -797,17 +797,17 @@ static void node_composit_buts_color_spill(uiLayout *layout, bContext *C, Pointe uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0); col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "algorithm", 0, NULL, 0); + uiItemR(col, ptr, "limit_method", 0, NULL, 0); - if(RNA_enum_get(ptr, "algorithm")==0) { + if(RNA_enum_get(ptr, "limit_method")==0) { uiItemL(col, "Limiting Channel:", 0); row=uiLayoutRow(col,0); uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0); } uiItemR(col, ptr, "ratio", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "unspill", 0, NULL, 0); - if (RNA_enum_get(ptr, "unspill")== 1) { + uiItemR(col, ptr, "use_unspill", 0, NULL, 0); + if (RNA_enum_get(ptr, "use_unspill")== 1) { uiItemR(col, ptr, "unspill_red", UI_ITEM_R_SLIDER, NULL, 0); uiItemR(col, ptr, "unspill_green", UI_ITEM_R_SLIDER, NULL, 0); uiItemR(col, ptr, "unspill_blue", UI_ITEM_R_SLIDER, NULL, 0); @@ -819,7 +819,7 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *C, Point uiLayout *col; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "acceptance", 0, NULL, 0); + uiItemR(col, ptr, "tolerance", 0, NULL, 0); uiItemR(col, ptr, "cutoff", 0, NULL, 0); col= uiLayoutColumn(layout, 1); @@ -853,8 +853,8 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, Poin col =uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "algorithm", 0, NULL, 0); - if(RNA_enum_get(ptr, "algorithm")==0) { + uiItemR(col, ptr, "limit_method", 0, NULL, 0); + if(RNA_enum_get(ptr, "limit_method")==0) { uiItemL(col, "Limiting Channel:", 0); row=uiLayoutRow(col,0); uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0); @@ -893,7 +893,7 @@ static void node_composit_buts_file_output(uiLayout *layout, bContext *C, Pointe row= uiLayoutRow(layout, 0); if (RNA_enum_get(ptr, "image_type")== R_OPENEXR) { - uiItemR(row, ptr, "exr_half", 0, NULL, 0); + uiItemR(row, ptr, "use_exr_half", 0, NULL, 0); uiItemR(row, ptr, "exr_codec", 0, "", 0); } else if (RNA_enum_get(ptr, "image_type")== R_JPEG90) { @@ -941,9 +941,9 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *C, Point { uiLayout *split, *col, *row; - uiItemR(layout, ptr, "correction_formula", 0, NULL, 0); + uiItemR(layout, ptr, "correction_method", 0, NULL, 0); - if (RNA_enum_get(ptr, "correction_formula")== 0) { + if (RNA_enum_get(ptr, "correction_method")== 0) { split = uiLayoutSplit(layout, 0, 0); col = uiLayoutColumn(split, 0); @@ -1164,7 +1164,7 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *C, PointerRNA *pt case TEX_BLEND: uiItemR(col, &tex_ptr, "progression", 0, "", 0); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "flip_axis", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, &tex_ptr, "use_flip_axis", UI_ITEM_R_EXPAND, NULL, 0); break; case TEX_MARBLE: @@ -1173,14 +1173,14 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *C, PointerRNA *pt row= uiLayoutRow(col, 0); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, 0); break; case TEX_WOOD: uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0); uiItemR(col, &tex_ptr, "stype", 0, "", 0); row= uiLayoutRow(col, 0); - uiItemR(row, &tex_ptr, "noisebasis2", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, 0); row= uiLayoutRow(col, 0); uiLayoutSetActive(row, !(RNA_enum_get(&tex_ptr, "stype")==TEX_BAND || RNA_enum_get(&tex_ptr, "stype")==TEX_RING)); uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0); diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 56b1922b90f..1fcd53d5d0f 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -203,13 +203,13 @@ static void rna_def_animviz_ghosts(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); /* XXX since this is only for 3d-view drawing */ /* Around Current Ranges */ - prop= RNA_def_property(srna, "before_current", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_before", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "ghost_bc"); RNA_def_property_range(prop, 0, 30); RNA_def_property_ui_text(prop, "Before Current", "Number of frames to show before the current frame (only for 'Around Current Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); /* XXX since this is only for 3d-view drawing */ - prop= RNA_def_property(srna, "after_current", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_after", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "ghost_ac"); RNA_def_property_range(prop, 0, 30); RNA_def_property_ui_text(prop, "After Current", "Number of frames to show after the current frame (only for 'Around Current Frame' Onion-skinning method)"); @@ -290,13 +290,13 @@ static void rna_def_animviz_paths(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); /* XXX since this is only for 3d-view drawing */ /* Around Current Ranges */ - prop= RNA_def_property(srna, "before_current", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_before", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "path_bc"); RNA_def_property_range(prop, 1, MAXFRAMEF/2); RNA_def_property_ui_text(prop, "Before Current", "Number of frames to show before the current frame (only for 'Around Current Frame' Onion-skinning method)"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL); /* XXX since this is only for 3d-view drawing */ - prop= RNA_def_property(srna, "after_current", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_after", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "path_ac"); RNA_def_property_range(prop, 1, MAXFRAMEF/2); RNA_def_property_ui_text(prop, "After Current", "Number of frames to show after the current frame (only for 'Around Current Frame' Onion-skinning method)"); diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index a2f75a63163..8b21fd2c80a 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -765,7 +765,8 @@ static void rna_def_armature(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Pose Position", "Show armature in binding pose or final posed state"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - prop= RNA_def_property(srna, "drawtype", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "draw_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "drawtype"); RNA_def_property_enum_items(prop, prop_drawtype_items); RNA_def_property_ui_text(prop, "Draw Type", ""); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); @@ -791,7 +792,7 @@ static void rna_def_armature(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); /* layer protection */ - prop= RNA_def_property(srna, "layer_protection", PROP_BOOLEAN, PROP_LAYER); + prop= RNA_def_property(srna, "layers_protected", PROP_BOOLEAN, PROP_LAYER); RNA_def_property_boolean_sdna(prop, NULL, "layer_protected", 1); RNA_def_property_array(prop, 32); RNA_def_property_ui_text(prop, "Layer Proxy Protection", "Protected layers in Proxy Instances are restored to Proxy settings on file reload and undo"); @@ -810,18 +811,18 @@ static void rna_def_armature(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); - prop= RNA_def_property(srna, "delay_deform", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_deform_delay", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ARM_DELAYDEFORM); RNA_def_property_ui_text(prop, "Delay Deform", "Don't deform children when manipulating bones in Pose Mode"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - prop= RNA_def_property(srna, "x_axis_mirror", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mirror_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ARM_MIRROR_EDIT); RNA_def_property_ui_text(prop, "X-Axis Mirror", "Apply changes to matching bone on opposite side of X-Axis"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); - prop= RNA_def_property(srna, "auto_ik", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_ik", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ARM_AUTO_IK); RNA_def_property_ui_text(prop, "Auto IK", "Add temporaral IK constraints while grabbing bones in Pose Mode"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); @@ -846,17 +847,17 @@ static void rna_def_armature(BlenderRNA *brna) // XXX depreceated ....... old animviz for armatures only /* deformflag */ - prop= RNA_def_property(srna, "deform_vertexgroups", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_deform_vertex_groups", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_VGROUP); RNA_def_property_ui_text(prop, "Deform Vertex Groups", "Enable Vertex Groups when defining deform"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - prop= RNA_def_property(srna, "deform_envelope", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_deform_envelopes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_ENVELOPE); RNA_def_property_ui_text(prop, "Deform Envelopes", "Enable Bone Envelopes when defining deform"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - prop= RNA_def_property(srna, "deform_quaternion", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_deform_preserve_volume", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_QUATERNION); RNA_def_property_ui_text(prop, "Use Dual Quaternion Deformation", "Enable deform rotation with Quaternions"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 58ecb78d3b8..e40bbcbbf50 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -273,7 +273,7 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Air Damping", "Air has normally some thickness which slows falling things down"); RNA_def_property_update(prop, 0, "rna_cloth_update"); - prop= RNA_def_property(srna, "pin_cloth", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_pin_cloth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_SIMSETTINGS_FLAG_GOAL); RNA_def_property_ui_text(prop, "Pin Cloth", "Enable pinning of cloth vertices to other objects/positions"); RNA_def_property_update(prop, 0, "rna_cloth_update"); @@ -292,7 +292,7 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) /* springs */ - prop= RNA_def_property(srna, "stiffness_scaling", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_stiffness_scale", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_SIMSETTINGS_FLAG_SCALING); RNA_def_property_ui_text(prop, "Stiffness Scaling", "If enabled, stiffness can be scaled along a weight painted vertex group"); RNA_def_property_update(prop, 0, "rna_cloth_update"); @@ -407,12 +407,12 @@ static void rna_def_cloth_collision_settings(BlenderRNA *brna) /* general collision */ - prop= RNA_def_property(srna, "enable_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_COLLSETTINGS_FLAG_ENABLED); RNA_def_property_ui_text(prop, "Enable Collision", "Enable collisions with other objects"); RNA_def_property_update(prop, 0, "rna_cloth_update"); - prop= RNA_def_property(srna, "min_distance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "distance_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "epsilon"); RNA_def_property_range(prop, 0.001f, 1.0f); RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance between collision objects before collision response takes in"); @@ -431,12 +431,12 @@ static void rna_def_cloth_collision_settings(BlenderRNA *brna) /* self collision */ - prop= RNA_def_property(srna, "enable_self_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_self_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_COLLSETTINGS_FLAG_SELF); RNA_def_property_ui_text(prop, "Enable Self Collision", "Enable self collisions"); RNA_def_property_update(prop, 0, "rna_cloth_update"); - prop= RNA_def_property(srna, "self_min_distance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "self_distance_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "selfepsilon"); RNA_def_property_range(prop, 0.5f, 1.0f); RNA_def_property_ui_text(prop, "Self Minimum Distance", "0.5 means no distance at all, 1.0 is maximum distance"); diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index d1319d99805..38242628fd1 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -437,7 +437,7 @@ static void rna_def_constraint_python(BlenderRNA *brna) RNA_def_property_struct_type(prop, "ConstraintTarget"); RNA_def_property_ui_text(prop, "Targets", "Target Objects"); - prop= RNA_def_property(srna, "number_of_targets", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "target_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "tarnum"); RNA_def_property_ui_text(prop, "Number of Targets", "Usually only 1-3 are needed"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); @@ -510,7 +510,7 @@ static void rna_def_constraint_kinematic(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Orientation Weight", "For Tree-IK: Weight of orientation control for this target"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "chain_length", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "chain_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "rootbone"); RNA_def_property_range(prop, 0, 255); RNA_def_property_ui_text(prop, "Chain Length", "How many bones are included in the IK effect - 0 uses all bones"); @@ -521,28 +521,28 @@ static void rna_def_constraint_kinematic(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Tail", "Include bone's tail as last element in chain"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "axis_reference", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "reference_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, constraint_ik_axisref_items); RNA_def_property_ui_text(prop, "Axis Reference", "Constraint axis Lock options relative to Bone or Target reference"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "use_position", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_location", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_IK_POS); RNA_def_property_ui_text(prop, "Position", "Chain follows position of target"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "pos_lock_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_location_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_POS_X); RNA_def_property_ui_text(prop, "Lock X Pos", "Constraint position along X axis"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "pos_lock_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_location_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_POS_Y); RNA_def_property_ui_text(prop, "Lock Y Pos", "Constraint position along Y axis"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "pos_lock_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_location_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_POS_Z); RNA_def_property_ui_text(prop, "Lock Z Pos", "Constraint position along Z axis"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Constraint_dependency_update"); @@ -552,17 +552,17 @@ static void rna_def_constraint_kinematic(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Rotation", "Chain follows rotation of target"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "rot_lock_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_rotation_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_ROT_X); RNA_def_property_ui_text(prop, "Lock X Rot", "Constraint rotation along X axis"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "rot_lock_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_rotation_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_ROT_Y); RNA_def_property_ui_text(prop, "Lock Y Rot", "Constraint rotation along Y axis"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "rot_lock_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_rotation_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_ROT_Z); RNA_def_property_ui_text(prop, "Lock Z Rot", "Constraint rotation along Z axis"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Constraint_dependency_update"); @@ -650,7 +650,7 @@ static void rna_def_constraint_track_to(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Up Axis", "Axis that points upward"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "target_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_target_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", TARGET_Z_UP); RNA_def_property_ui_text(prop, "Target Z", "Target's Z axis, not World Z axis, will constraint the Up direction"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -978,14 +978,14 @@ static void rna_def_constraint_action(BlenderRNA *brna) RNA_def_property_ui_text(prop, "End Frame", "Last frame of the Action to use"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "max"); RNA_def_property_range(prop, -1000.f, 1000.f); RNA_def_property_ui_text(prop, "Maximum", "Maximum value for target channel range"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_ActionConstraint_minmax_range"); - prop= RNA_def_property(srna, "minimum", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "min"); RNA_def_property_range(prop, -1000.f, 1000.f); RNA_def_property_ui_text(prop, "Minimum", "Minimum value for target channel range"); @@ -1100,7 +1100,7 @@ static void rna_def_constraint_follow_path(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Follow Curve", "Object will follow the heading and banking of the curve"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_fixed_position", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_fixed_location", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "followflag", FOLLOWPATH_STATIC); RNA_def_property_ui_text(prop, "Fixed Position", "Object will stay locked to a single point somewhere along the length of the curve regardless of time"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -1161,7 +1161,7 @@ static void rna_def_constraint_stretch_to(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Keep Axis", "Axis to maintain during stretch"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "original_length", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "rest_length", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "orglength"); RNA_def_property_range(prop, 0.0, 100.f); RNA_def_property_ui_text(prop, "Original Length", "Length at rest position"); @@ -1354,7 +1354,7 @@ static void rna_def_constraint_transform(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Map To Z From", "The source axis constrained object's Z axis uses"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "extrapolate_motion", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_motion_extrapolate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "expo", CLAMPTO_CYCLIC); RNA_def_property_ui_text(prop, "Extrapolate Motion", "Extrapolate ranges"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -1441,73 +1441,73 @@ static void rna_def_constraint_location_limit(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Limit Location Constraint", "Limits the location of the constrained object"); RNA_def_struct_sdna_from(srna, "bLocLimitConstraint", "data"); - prop= RNA_def_property(srna, "use_minimum_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_min_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_XMIN); RNA_def_property_ui_text(prop, "Minimum X", "Use the minimum X value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_minimum_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_min_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_YMIN); RNA_def_property_ui_text(prop, "Minimum Y", "Use the minimum Y value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_minimum_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_min_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_ZMIN); RNA_def_property_ui_text(prop, "Minimum Z", "Use the minimum Z value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_maximum_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_max_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_XMAX); RNA_def_property_ui_text(prop, "Maximum X", "Use the maximum X value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_maximum_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_max_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_YMAX); RNA_def_property_ui_text(prop, "Maximum Y", "Use the maximum Y value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_maximum_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_max_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_ZMAX); RNA_def_property_ui_text(prop, "Maximum Z", "Use the maximum Z value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_x", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "min_x", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "xmin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum X", "Lowest X value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_y", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "min_y", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "ymin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum Y", "Lowest Y value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_z", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "min_z", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "zmin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum Z", "Lowest Z value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_x", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "max_x", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "xmax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum X", "Highest X value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_y", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "max_y", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "ymax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum Y", "Highest Y value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_z", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "max_z", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "zmax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum Z", "Highest Z value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "limit_transform", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_transform_limit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", LIMIT_TRANSFORM); RNA_def_property_ui_text(prop, "For Transform", "Transforms are affected by this constraint as well"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -1537,43 +1537,43 @@ static void rna_def_constraint_rotation_limit(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Limit Z", "Use the minimum Z value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_x", PROP_FLOAT, PROP_ANGLE); + prop= RNA_def_property(srna, "min_x", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "xmin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum X", "Lowest X value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_y", PROP_FLOAT, PROP_ANGLE); + prop= RNA_def_property(srna, "min_y", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "ymin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum Y", "Lowest Y value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_z", PROP_FLOAT, PROP_ANGLE); + prop= RNA_def_property(srna, "min_z", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "zmin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum Z", "Lowest Z value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_x", PROP_FLOAT, PROP_ANGLE); + prop= RNA_def_property(srna, "max_x", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "xmax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum X", "Highest X value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_y", PROP_FLOAT, PROP_ANGLE); + prop= RNA_def_property(srna, "max_y", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "ymax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum Y", "Highest Y value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_z", PROP_FLOAT, PROP_ANGLE); + prop= RNA_def_property(srna, "max_z", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "zmax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum Z", "Highest Z value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "limit_transform", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_transform_limit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", LIMIT_TRANSFORM); RNA_def_property_ui_text(prop, "For Transform", "Transforms are affected by this constraint as well"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -1588,73 +1588,73 @@ static void rna_def_constraint_size_limit(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Limit Size Constraint", "Limits the scaling of the constrained object"); RNA_def_struct_sdna_from(srna, "bSizeLimitConstraint", "data"); - prop= RNA_def_property(srna, "use_minimum_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_min_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_XMIN); RNA_def_property_ui_text(prop, "Minimum X", "Use the minimum X value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_minimum_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_min_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_YMIN); RNA_def_property_ui_text(prop, "Minimum Y", "Use the minimum Y value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_minimum_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_min_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_ZMIN); RNA_def_property_ui_text(prop, "Minimum Z", "Use the minimum Z value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_maximum_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_max_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_XMAX); RNA_def_property_ui_text(prop, "Maximum X", "Use the maximum X value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_maximum_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_max_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_YMAX); RNA_def_property_ui_text(prop, "Maximum Y", "Use the maximum Y value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "use_maximum_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_max_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIMIT_ZMAX); RNA_def_property_ui_text(prop, "Maximum Z", "Use the maximum Z value"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_x", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "min_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "xmin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum X", "Lowest X value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_y", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "min_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ymin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum Y", "Lowest Y value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "minimum_z", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "min_z", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "zmin"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Minimum Z", "Lowest Z value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_x", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "max_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "xmax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum X", "Highest X value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_y", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "max_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ymax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum Y", "Highest Y value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "maximum_z", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "max_z", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "zmax"); RNA_def_property_range(prop, -1000.0, 1000.f); RNA_def_property_ui_text(prop, "Maximum Z", "Highest Z value to allow"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "limit_transform", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_transform_limit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", LIMIT_TRANSFORM); RNA_def_property_ui_text(prop, "For Transform", "Transforms are affected by this constraint as well"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -1801,7 +1801,7 @@ static void rna_def_constraint_spline_ik(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "chain_length", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "chain_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "chainlen"); RNA_def_property_range(prop, 1, 255); // TODO: this should really check the max length of the chain the constraint is attached to RNA_def_property_ui_text(prop, "Chain Length", "How many bones are included in the chain"); @@ -1818,17 +1818,17 @@ static void rna_def_constraint_spline_ik(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); /* settings */ - prop= RNA_def_property(srna, "chain_offset", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_chain_offset", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_SPLINEIK_NO_ROOT); RNA_def_property_ui_text(prop, "Chain Offset", "Offset the entire chain relative to the root joint"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "even_divisions", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_even_divisions", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_SPLINEIK_EVENSPLITS); RNA_def_property_ui_text(prop, "Even Divisions", "Ignore the relative lengths of the bones when fitting to the curve"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "y_stretch", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_y_stretch", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_SPLINEIK_SCALE_LIMITED); RNA_def_property_ui_text(prop, "Y Stretch", "Stretch the Y axis of the bones to fit the curve"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -1838,7 +1838,7 @@ static void rna_def_constraint_spline_ik(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Curve Radius", "Average radius of the endpoints is used to tweak the X and Z Scaling of the bones, on top of XZ Scale mode"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "xz_scaling_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "xz_scale_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "xzScaleMode"); RNA_def_property_enum_items(prop, splineik_xz_scale_mode); RNA_def_property_ui_text(prop, "XZ Scale Mode", "Method used for determining the scaling of the X and Z axes of the bones"); @@ -1883,7 +1883,7 @@ static void rna_def_constraint_pivot(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); /* pivot offset */ - prop= RNA_def_property(srna, "use_relative_position", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_relative_location", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", PIVOTCON_FLAG_OFFSET_ABS); RNA_def_property_ui_text(prop, "Use Relative Offset", "Offset will be an absolute point in space instead of relative to the target"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -1894,7 +1894,7 @@ static void rna_def_constraint_pivot(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); /* rotation-based activation */ - prop= RNA_def_property(srna, "enabled_rotation_range", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "rotation_range", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "rotAxis"); RNA_def_property_enum_items(prop, pivot_rotAxis_items); RNA_def_property_ui_text(prop, "Enabled Rotation Range", "Rotation range on which pivoting should occur"); @@ -1960,7 +1960,7 @@ void RNA_def_constraint(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_ACTIVE); RNA_def_property_ui_text(prop, "Active", "Constraint is the one being edited "); - prop= RNA_def_property(srna, "proxy_local", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_proxy_local", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_PROXY_LOCAL); RNA_def_property_ui_text(prop, "Proxy Local", "Constraint was added in this proxy instance (i.e. did not belong to source Armature)"); diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index e3e90780825..423e5e4d203 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -909,17 +909,17 @@ static void rna_def_charinfo(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Text Character Format", "Text character formatting settings"); /* flags */ - prop= RNA_def_property(srna, "bold", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_bold", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_BOLD); RNA_def_property_ui_text(prop, "Bold", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "italic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_italic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_ITALIC); RNA_def_property_ui_text(prop, "Italic", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "underline", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_underline", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_UNDERLINE); RNA_def_property_ui_text(prop, "Underline", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); @@ -1108,7 +1108,7 @@ static void rna_def_curve(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Bevel Resolution", "Bevel resolution when depth is non-zero and no specific bevel object has been defined"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "width", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "width"); RNA_def_property_ui_range(prop, 0, 2.0, 0.1, 0); RNA_def_property_ui_text(prop, "Width", "Scale the original width (1.0) based on given factor"); diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index 6ef41830fa1..68060e2cfe3 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -228,7 +228,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna) RNA_def_property_enum_items(prop, quality_items); RNA_def_property_ui_text(prop, "Render Display Mode", "How to display the mesh for rendering"); - prop= RNA_def_property(srna, "reverse_frames", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_reverse_frames", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_FLUIDSIM_REVERSE); RNA_def_property_ui_text(prop, "Reverse Frames", "Reverse fluid frames"); @@ -250,7 +250,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna) RNA_def_property_range(prop, -1000.1, 1000.1); RNA_def_property_ui_text(prop, "Gravity", "Gravity in X, Y and Z direction"); - prop= RNA_def_property(srna, "override_time", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_time_override", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_FLUIDSIM_OVERRIDE_TIME); RNA_def_property_ui_text(prop, "Override Time", "Use a custom start and end time (in seconds) instead of the scene's timeline"); @@ -264,7 +264,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna) RNA_def_property_range(prop, 0, 100); RNA_def_property_ui_text(prop, "End Time", "Simulation time of the last blender frame (in seconds)"); - prop= RNA_def_property(srna, "real_world_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "simulation_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "realsize"); RNA_def_property_range(prop, 0.001, 10); RNA_def_property_ui_text(prop, "Real World Size", "Size of the simulation domain in metres"); @@ -300,7 +300,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna) rna_def_fluidsim_slip(srna); - prop= RNA_def_property(srna, "surface_smoothing", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "surface_smooth", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "surfaceSmoothing"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 0.0, 5.0); @@ -312,7 +312,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna) RNA_def_property_range(prop, 0, 5); RNA_def_property_ui_text(prop, "Surface Subdivisions", "Number of isosurface subdivisions. This is necessary for the inclusion of particles into the surface generation. Warning - can lead to longer computation times!"); - prop= RNA_def_property(srna, "generate_speed_vectors", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_speed_vectors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "domainNovecgen", 0); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Generate Speed Vectors", "Generate speed vectors for vector blur"); @@ -348,7 +348,7 @@ static void rna_def_fluidsim_volume(StructRNA *srna) RNA_def_property_enum_items(prop, volume_type_items); RNA_def_property_ui_text(prop, "Volume Initialization", "Volume initialization type"); - prop= RNA_def_property(srna, "export_animated_mesh", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_animated_mesh", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "domainNovecgen", 0); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Export Animated Mesh", "Export this mesh as an animated one. Slower, only use if really necessary (e.g. armatures or parented objects), animated pos/rot/scale IPOs do not require it"); @@ -420,7 +420,7 @@ static void rna_def_fluidsim_inflow(BlenderRNA *brna) RNA_def_property_range(prop, -1000.1, 1000.1); RNA_def_property_ui_text(prop, "Inflow Velocity", "Initial velocity of fluid"); - prop= RNA_def_property(srna, "local_coordinates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_local_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_boolean_sdna(prop, NULL, "typeFlags", OB_FSINFLOW_LOCALCOORD); RNA_def_property_ui_text(prop, "Local Coordinates", "Use local coordinates for inflow. (e.g. for rotating objects)"); @@ -447,11 +447,11 @@ static void rna_def_fluidsim_particle(BlenderRNA *brna) RNA_def_struct_sdna(srna, "FluidsimSettings"); RNA_def_struct_ui_text(srna, "Particle Fluid Simulation Settings", "Fluid simulation settings for objects storing fluid particles generated by the simulation"); - prop= RNA_def_property(srna, "drops", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_drops", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "typeFlags", OB_FSPART_DROP); RNA_def_property_ui_text(prop, "Drops", "Show drop particles"); - prop= RNA_def_property(srna, "floats", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_floats", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "typeFlags", OB_FSPART_FLOAT); RNA_def_property_ui_text(prop, "Floats", "Show floating foam particles"); @@ -523,7 +523,7 @@ static void rna_def_fluidsim_control(BlenderRNA *brna) RNA_def_property_range(prop, 5.0, 100.0); RNA_def_property_ui_text(prop, "Quality", "Specifies the quality which is used for object sampling. (higher = better but slower)"); - prop= RNA_def_property(srna, "reverse_frames", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_reverse_frames", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_FLUIDSIM_REVERSE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Reverse Frames", "Reverse control object movement"); diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 7e60572ec80..ea4821be9d9 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -223,7 +223,7 @@ static void rna_def_imageuser(BlenderRNA *brna) srna= RNA_def_struct(brna, "ImageUser", NULL); RNA_def_struct_ui_text(srna, "Image User", "Parameters defining how an Image datablock is used by another datablock"); - prop= RNA_def_property(srna, "auto_refresh", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_refresh", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_ANIM_ALWAYS); RNA_def_property_ui_text(prop, "Auto Refresh", "Always refresh image on frame changes"); RNA_def_property_update(prop, 0, "rna_ImageUser_update"); @@ -339,7 +339,7 @@ static void rna_def_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Fields", "Use fields of the image"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_fields_update"); - prop= RNA_def_property(srna, "premultiply", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_DO_PREMUL); RNA_def_property_ui_text(prop, "Premultiply", "Convert RGB from key alpha to premultiplied alpha"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_reload_update"); @@ -382,24 +382,24 @@ static void rna_def_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Display Aspect", "Display Aspect for this image, does not affect rendering"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); - prop= RNA_def_property(srna, "animated", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_animation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_TWINANIM); RNA_def_property_ui_text(prop, "Animated", "Use as animated texture in the game engine"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_animated_update"); - prop= RNA_def_property(srna, "animation_start", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "twsta"); RNA_def_property_range(prop, 0, 128); RNA_def_property_ui_text(prop, "Animation Start", "Start frame of an animated texture"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_animated_update"); - prop= RNA_def_property(srna, "animation_end", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "twend"); RNA_def_property_range(prop, 0, 128); RNA_def_property_ui_text(prop, "Animation End", "End frame of an animated texture"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, "rna_Image_animated_update"); - prop= RNA_def_property(srna, "animation_speed", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "fps", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "animspeed"); RNA_def_property_range(prop, 1, 100); RNA_def_property_ui_text(prop, "Animation Speed", "Speed of the animation in frames per second"); @@ -422,12 +422,12 @@ static void rna_def_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Tiles Y", "Degree of repetition in the Y direction"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); - prop= RNA_def_property(srna, "clamp_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_clamp_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_CLAMP_U); RNA_def_property_ui_text(prop, "Clamp X", "Disable texture repeating horizontally"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); - prop= RNA_def_property(srna, "clamp_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_clamp_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_CLAMP_V); RNA_def_property_ui_text(prop, "Clamp Y", "Disable texture repeating vertically"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 4a33b281a34..861593e4462 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -159,7 +159,7 @@ static void rna_def_lamp_mtex(BlenderRNA *brna) RNA_def_struct_sdna(srna, "MTex"); RNA_def_struct_ui_text(srna, "Lamp Texture Slot", "Texture slot for textures in a Lamp datablock"); - prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texco"); RNA_def_property_enum_items(prop, prop_texture_coordinates_items); RNA_def_property_ui_text(prop, "Texture Coordinates", ""); @@ -170,12 +170,12 @@ static void rna_def_lamp_mtex(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Object", "Object to use for mapping with Object texture coordinates"); - prop= RNA_def_property(srna, "map_color", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", LAMAP_COL); RNA_def_property_ui_text(prop, "Color", "Lets the texture affect the basic color of the lamp"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "map_shadow", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", LAMAP_SHAD); RNA_def_property_ui_text(prop, "Shadow", "Lets the texture affect the shadow color of the lamp"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); @@ -412,7 +412,7 @@ static void rna_def_lamp_falloff(StructRNA *srna) RNA_def_property_ui_text(prop, "Falloff Curve", "Custom Lamp Falloff Curve"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "sphere", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_sphere", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_SPHERE); RNA_def_property_ui_text(prop, "Sphere", "Sets light intensity to zero beyond lamp distance"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); @@ -468,12 +468,12 @@ static void rna_def_lamp_shadow(StructRNA *srna, int spot, int area) RNA_def_property_ui_text(prop, "Shadow Color", "Color of shadows cast by the lamp"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "only_shadow", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_only_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_ONLYSHADOW); RNA_def_property_ui_text(prop, "Only Shadow", "Causes light to cast shadows only without illuminating objects"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "shadow_ray_sampling_method", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "shadow_ray_sample_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ray_samp_method"); RNA_def_property_enum_items(prop, (area)? prop_spot_ray_sampling_method_items: prop_ray_sampling_method_items); RNA_def_property_ui_text(prop, "Shadow Ray Sampling Method", "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower"); @@ -505,7 +505,7 @@ static void rna_def_lamp_shadow(StructRNA *srna, int spot, int area) RNA_def_property_ui_text(prop, "Shadow Soft Size", "Light size for ray shadow sampling (Raytraced shadows)"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "shadow_layer", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shadow_layer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_LAYER_SHADOW); RNA_def_property_ui_text(prop, "Shadow Layer", "Causes only objects on the same layer to cast shadows"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); @@ -541,7 +541,7 @@ static void rna_def_area_lamp(BlenderRNA *brna) rna_def_lamp_shadow(srna, 0, 1); - prop= RNA_def_property(srna, "umbra", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_umbra", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ray_samp_type", LA_SAMP_UMBRA); RNA_def_property_ui_text(prop, "Umbra", "Emphasize parts that are fully shadowed (Constant Jittered sampling)"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); @@ -708,12 +708,12 @@ static void rna_def_spot_lamp(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Shadow Buffer Type", "Type of shadow buffer"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "auto_clip_start", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_clip_start", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bufflag", LA_SHADBUF_AUTO_START); RNA_def_property_ui_text(prop, "Autoclip Start", "Automatic calculation of clipping-start, based on visible vertices"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); - prop= RNA_def_property(srna, "auto_clip_end", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_clip_end", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bufflag", LA_SHADBUF_AUTO_END); RNA_def_property_ui_text(prop, "Autoclip End", "Automatic calculation of clipping-end, based on visible vertices"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 9fb8a0b3705..bc1c27b8fe1 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -323,7 +323,7 @@ static void rna_def_material_mtex(BlenderRNA *brna) RNA_def_struct_sdna(srna, "MTex"); RNA_def_struct_ui_text(srna, "Material Texture Slot", "Texture slot for textures in a Material datablock"); - prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texco"); RNA_def_property_enum_items(prop, prop_texture_coordinates_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Material_texture_coordinates_itemf"); @@ -342,99 +342,99 @@ static void rna_def_material_mtex(BlenderRNA *brna) RNA_def_property_ui_text(prop, "UV Layer", "UV layer to use for mapping with UV texture coordinates"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "from_dupli", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_from_dupli", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_DUPLI_MAPTO); RNA_def_property_ui_text(prop, "From Dupli", "Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "from_original", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_from_original", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_OB_DUPLI_ORIG); RNA_def_property_ui_text(prop, "From Original", "Dupli's derive their object coordinates from the original objects transformation"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_colordiff", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_color_diff", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COL); RNA_def_property_ui_text(prop, "Diffuse Color", "Causes the texture to affect basic color of the material"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_NORM); RNA_def_property_ui_text(prop, "Normal", "Causes the texture to affect the rendered normal"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_colorspec", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_color_spec", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COLSPEC); RNA_def_property_ui_text(prop, "Specular Color", "Causes the texture to affect the specularity color"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_mirror", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_mirror", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COLMIR); RNA_def_property_ui_text(prop, "Mirror", "Causes the texture to affect the mirror color"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_diffuse", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_REF); RNA_def_property_ui_text(prop, "Diffuse", "Causes the texture to affect the value of the materials diffuse reflectivity"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_specular", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_SPEC); RNA_def_property_ui_text(prop, "Specular", "Causes the texture to affect the value of specular reflectivity"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_ambient", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_ambient", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_AMB); RNA_def_property_ui_text(prop, "Ambient", "Causes the texture to affect the value of ambient"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_hardness", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_hardness", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_HAR); RNA_def_property_ui_text(prop, "Hardness", "Causes the texture to affect the hardness value"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_raymir", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_raymir", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_RAYMIRR); RNA_def_property_ui_text(prop, "Ray-Mirror", "Causes the texture to affect the ray-mirror value"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_alpha", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_ALPHA); RNA_def_property_ui_text(prop, "Alpha", "Causes the texture to affect the alpha value"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_emit", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMIT); RNA_def_property_ui_text(prop, "Emit", "Causes the texture to affect the emit value"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_translucency", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_translucency", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_TRANSLU); RNA_def_property_ui_text(prop, "Translucency", "Causes the texture to affect the translucency value"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_displacement", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_displacement", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_DISPLACE); RNA_def_property_ui_text(prop, "Displacement", "Let the texture displace the surface"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_warp", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_warp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_WARP); RNA_def_property_ui_text(prop, "Warp", "Let the texture warp texture coordinates of next channels"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "x_mapping", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "mapping_x", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "projx"); RNA_def_property_enum_items(prop, prop_x_mapping_items); RNA_def_property_ui_text(prop, "X Mapping", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "y_mapping", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "mapping_y", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "projy"); RNA_def_property_enum_items(prop, prop_y_mapping_items); RNA_def_property_ui_text(prop, "Y Mapping", ""); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "z_mapping", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "mapping_z", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "projz"); RNA_def_property_enum_items(prop, prop_z_mapping_items); RNA_def_property_ui_text(prop, "Z Mapping", ""); @@ -469,13 +469,13 @@ static void rna_def_material_mtex(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Warp Factor", "Amount texture affects texture coordinates of next channels"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "colorspec_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "specular_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colspecfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); RNA_def_property_ui_text(prop, "Specular Color Factor", "Amount texture affects specular color"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "colordiff_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "diffuse_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); RNA_def_property_ui_text(prop, "Diffuse Color Factor", "Amount texture affects diffuse color"); @@ -536,54 +536,54 @@ static void rna_def_material_mtex(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Material_update"); /* volume material */ - prop= RNA_def_property(srna, "map_coloremission", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_color_emission", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMISSION_COL); RNA_def_property_ui_text(prop, "Emission Color", "Causes the texture to affect the color of emission"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_colorreflection", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_color_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_REFLECTION_COL); RNA_def_property_ui_text(prop, "Reflection Color", "Causes the texture to affect the color of scattered light"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_colortransmission", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_color_transmission", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_TRANSMISSION_COL); RNA_def_property_ui_text(prop, "Transmission Color", "Causes the texture to affect the result color after other light has been scattered/absorbed"); RNA_def_property_update(prop, NC_TEXTURE, NULL); - prop= RNA_def_property(srna, "map_density", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_density", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_DENSITY); RNA_def_property_ui_text(prop, "Density", "Causes the texture to affect the volume's density"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_emission", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_emission", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_EMISSION); RNA_def_property_ui_text(prop, "Emission", "Causes the texture to affect the volume's emission"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_scattering", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_scatter", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_SCATTERING); RNA_def_property_ui_text(prop, "Scattering", "Causes the texture to affect the volume's scattering"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "map_reflection", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_reflect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_REFLECTION); RNA_def_property_ui_text(prop, "Reflection", "Causes the texture to affect the reflected light's brightness"); RNA_def_property_update(prop, NC_TEXTURE, NULL); - prop= RNA_def_property(srna, "coloremission_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "color_emission_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colemitfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); RNA_def_property_ui_text(prop, "Emission Color Factor", "Amount texture affects emission color"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "colorreflection_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "reflection_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "colreflfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); RNA_def_property_ui_text(prop, "Reflection Color Factor", "Amount texture affects color of out-scattered light"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "colortransmission_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "transmission_color_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "coltransfac"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); RNA_def_property_ui_text(prop, "Transmission Color Factor", "Amount texture affects result color after light has been scattered/absorbed"); @@ -984,7 +984,7 @@ static void rna_def_material_volume(BlenderRNA *brna) RNA_def_struct_nested(brna, srna, "Material"); RNA_def_struct_ui_text(srna, "Material Volume", "Volume rendering settings for a Material datablock"); - prop= RNA_def_property(srna, "step_calculation", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "step_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "stepsize_type"); RNA_def_property_enum_items(prop, prop_stepsize_items); RNA_def_property_ui_text(prop, "Step Calculation", "Method of calculating the steps through the volume"); @@ -997,18 +997,18 @@ static void rna_def_material_volume(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Step Size", "Distance between subsequent volume depth samples"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "lighting_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "light_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "shade_type"); RNA_def_property_enum_items(prop, prop_lighting_items); RNA_def_property_ui_text(prop, "Lighting Mode", "Method of shading, attenuating, and scattering light through the volume"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "external_shadows", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_external_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shadeflag", MA_VOL_RECV_EXT_SHADOW); /* use bitflags */ RNA_def_property_ui_text(prop, "External Shadows", "Receive shadows from sources outside the volume (temporary)"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "light_cache", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_light_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shadeflag", MA_VOL_PRECACHESHADING); /* use bitflags */ RNA_def_property_ui_text(prop, "Light Cache", "Pre-calculate the shading information into a voxel grid, speeds up shading at slightly less accuracy"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1038,7 +1038,7 @@ static void rna_def_material_volume(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Intensity", "Multiplier for multiple scattered light energy"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "depth_cutoff", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "depth_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "depth_cutoff"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Depth Cutoff", "Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy"); @@ -1132,19 +1132,19 @@ static void rna_def_material_halo(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Add", "Sets the strength of the add effect"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "rings", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "ring_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ringc"); RNA_def_property_range(prop, 0, 24); RNA_def_property_ui_text(prop, "Rings", "Sets the number of rings rendered over the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "line_number", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "line_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "linec"); RNA_def_property_range(prop, 0, 250); RNA_def_property_ui_text(prop, "Line Number", "Sets the number of star shaped lines rendered over the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "star_tips", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "star_tip_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "starc"); RNA_def_property_range(prop, 3, 50); RNA_def_property_ui_text(prop, "Star Tips", "Sets the number of points on the star shaped halo"); @@ -1156,7 +1156,7 @@ static void rna_def_material_halo(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Seed", "Randomizes ring dimension and line location"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "flare_mode", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_flare_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_FLARE); /* use bitflags */ RNA_def_property_ui_text(prop, "Flare", "Renders halo as a lensflare"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1167,7 +1167,7 @@ static void rna_def_material_halo(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Flare Size", "Sets the factor by which the flare is larger than the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "flare_subsize", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "flare_subflare_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "subsize"); RNA_def_property_range(prop, 0.1f, 25.0f); RNA_def_property_ui_text(prop, "Flare Subsize", "Sets the dimension of the subflares, dots and circles"); @@ -1185,7 +1185,7 @@ static void rna_def_material_halo(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Flare Seed", "Specifies an offset in the flare seed table"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "flares_sub", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "flare_subflare_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "flarec"); RNA_def_property_range(prop, 1, 32); RNA_def_property_ui_text(prop, "Flares Sub", "Sets the number of subflares"); @@ -1211,12 +1211,12 @@ static void rna_def_material_halo(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Texture", "Gives halo a texture"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "vertex_normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_vertex_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALOPUNO); RNA_def_property_ui_text(prop, "Vertex Normal", "Uses the vertex normal to specify the dimension of the halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "xalpha", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_extreme_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_XALPHA); RNA_def_property_ui_text(prop, "Extreme Alpha", "Uses extreme alpha"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1254,7 +1254,7 @@ static void rna_def_material_sss(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Color", "Scattering color"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "error_tolerance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "error_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sss_error"); RNA_def_property_ui_range(prop, 0.0001, 10, 1, 3); RNA_def_property_ui_text(prop, "Error Tolerance", "Error tolerance (low values are slower and higher quality)"); @@ -1372,12 +1372,12 @@ static void rna_def_material_strand(BlenderRNA *brna) RNA_def_struct_nested(brna, srna, "Material"); RNA_def_struct_ui_text(srna, "Material Strand", "Strand settings for a Material datablock"); - prop= RNA_def_property(srna, "tangent_shading", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_tangent_shading", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TANGENT_STR); RNA_def_property_ui_text(prop, "Tangent Shading", "Uses direction of strands as normal for tangent-shading"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "surface_diffuse", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_surface_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_STR_SURFDIFF); RNA_def_property_ui_text(prop, "Surface Diffuse", "Make diffuse shading more similar to shading the surface"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1388,7 +1388,7 @@ static void rna_def_material_strand(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Blend Distance", "Worldspace distance over which to blend in the surface normal"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "blender_units", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_blender_units", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_STR_B_UNITS); RNA_def_property_ui_text(prop, "Blender Units", "Use Blender units for widths instead of pixels"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1407,7 +1407,7 @@ static void rna_def_material_strand(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Tip Size", "End size of strands in pixels or Blender units"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "min_size", PROP_FLOAT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "size_min", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_sdna(prop, NULL, "strand_min"); RNA_def_property_range(prop, 0.001, 10); RNA_def_property_ui_text(prop, "Minimum Size", "Minimum size of strands in pixels"); @@ -1441,7 +1441,7 @@ static void rna_def_material_physics(BlenderRNA *brna) RNA_def_struct_nested(brna, srna, "Material"); RNA_def_struct_ui_text(srna, "Material Physics", "Physics settings for a Material datablock"); - prop= RNA_def_property(srna, "align_to_normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_normal_align", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dynamode", MA_FH_NOR); RNA_def_property_ui_text(prop, "Align to Normal", "Align dynamic game objects along the surface normal, when inside the physics distance area"); @@ -1508,7 +1508,7 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, NULL, "rna_Material_type_set", NULL); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); - prop= RNA_def_property(srna, "transparency", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_transparency", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TRANSP); RNA_def_property_ui_text(prop, "Transparency", "Render material as transparent"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1548,7 +1548,7 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Cubic Interpolation", "Use cubic interpolation for diffuse values, for smoother transitions"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "object_color", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_object_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_OBCOLOR); RNA_def_property_ui_text(prop, "Object Color", "Modulate the result with a per-object color"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1563,7 +1563,7 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_range(prop, 0, 10); RNA_def_property_ui_text(prop, "Shadow Buffer Bias", "Factor to multiply shadow buffer bias with (0 is ignore.)"); - prop= RNA_def_property(srna, "shadow_casting_alpha", PROP_FLOAT, PROP_FACTOR); + prop= RNA_def_property(srna, "shadow_cast_alpha", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "shad_alpha"); RNA_def_property_range(prop, 0.001, 1); RNA_def_property_ui_text(prop, "Shadow Casting Alpha", "Shadow casting alpha, in use for Irregular and Deep shadow buffer"); @@ -1578,12 +1578,12 @@ void RNA_def_material(BlenderRNA *brna) /* flags */ - prop= RNA_def_property(srna, "light_group_exclusive", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_light_group_exclusive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_GROUP_NOLAY); RNA_def_property_ui_text(prop, "Light Group Exclusive", "Material uses the light group exclusively - these lamps are excluded from other scene lighting"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "traceable", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_raytrace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TRACEBLE); RNA_def_property_ui_text(prop, "Traceable", "Include this material and geometry that uses it in ray tracing calculations"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1593,17 +1593,17 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Shadows", "Allows this material to receive shadows"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "shadeless", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shadeless", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHLESS); RNA_def_property_ui_text(prop, "Shadeless", "Makes this material insensitive to light or shadow"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "vertex_color_light", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_vertex_color_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_VERTEXCOL); RNA_def_property_ui_text(prop, "Vertex Color Light", "Add vertex colors as additional lighting"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "vertex_color_paint", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_vertex_color_paint", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_VERTEXCOLP); RNA_def_property_ui_text(prop, "Vertex Color Paint", "Replaces object base color with vertex colors (multiplies with 'texture face' face assigned textures)"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1613,7 +1613,7 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Invert Z Depth", "Renders material's faces with an inverted Z buffer (scanline only)"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "z_offset", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "offset_z", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "zoffs"); RNA_def_property_ui_text(prop, "Z Offset", "Gives faces an artificial offset in the Z buffer for Z transparency"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1623,22 +1623,22 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Sky", "Renders this material with zero alpha, with sky background in place (scanline only)"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "only_shadow", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_only_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ONLYSHADOW); RNA_def_property_ui_text(prop, "Only Shadow", "Renders shadows as the material's alpha value, making materials transparent except for shadowed areas"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "face_texture", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_face_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FACETEXTURE); RNA_def_property_ui_text(prop, "Face Textures", "Replaces the object's base color with color from face assigned image textures"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "face_texture_alpha", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_face_texture_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FACETEXTURE_ALPHA); RNA_def_property_ui_text(prop, "Face Textures Alpha", "Replaces the object's base alpha value with alpha from face assigned image textures"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "cast_shadows_only", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cast_shadows_only", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_ONLYCAST); RNA_def_property_ui_text(prop, "Cast Shadows Only", "Makes objects with this material appear invisible, only casting shadows (not rendered)"); RNA_def_property_update(prop, 0, "rna_Material_update"); @@ -1648,32 +1648,32 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Mist", "Use mist with this material (in world settings)"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "receive_transparent_shadows", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_transparent_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHADOW_TRA); RNA_def_property_ui_text(prop, "Receive Transparent Shadows", "Allow this object to receive transparent shadows casted through other objects"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "ray_shadow_bias", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_ray_shadow_bias", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAYBIAS); RNA_def_property_ui_text(prop, "Ray Shadow Bias", "Prevents raytraced shadow errors on surfaces with smooth shaded normals (terminator problem)"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "full_oversampling", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_full_oversampling", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_FULL_OSA); RNA_def_property_ui_text(prop, "Full Oversampling", "Force this material to render full shading/textures for all anti-aliasing samples"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "cast_buffer_shadows", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cast_buffer_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHADBUF); RNA_def_property_ui_text(prop, "Cast Buffer Shadows", "Allow this material to cast shadows from shadow buffer lamps"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "cast_approximate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cast_approximate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_APPROX_OCCLUSION); RNA_def_property_ui_text(prop, "Cast Approximate", "Allow this material to cast shadows when using approximate ambient occlusion."); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "tangent_shading", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_tangent_shading", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TANGENT_V); RNA_def_property_ui_text(prop, "Tangent Shading", "Use the material's tangent vector instead of the normal for shading - for anisotropic shading effects"); RNA_def_property_update(prop, 0, "rna_Material_update"); diff --git a/source/blender/makesrna/intern/rna_material_api.c b/source/blender/makesrna/intern/rna_material_api.c index 43c1a9be765..d271b3b374c 100644 --- a/source/blender/makesrna/intern/rna_material_api.c +++ b/source/blender/makesrna/intern/rna_material_api.c @@ -119,7 +119,7 @@ void RNA_api_material(StructRNA *srna) RNA_def_function_ui_description(func, "Add a texture to material's free texture slot."); parm= RNA_def_pointer(func, "texture", "Texture", "Texture", "Texture to add."); RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_enum(func, "texture_coordinates", prop_texture_coordinates_items, TEXCO_UV, "", "Source of texture coordinate information."); /* optional */ + parm= RNA_def_enum(func, "texture_coords", prop_texture_coordinates_items, TEXCO_UV, "", "Source of texture coordinate information."); /* optional */ parm= RNA_def_enum(func, "map_to", prop_texture_mapto_items, MAP_COL, "", "Controls which material property the texture affects."); /* optional */ RNA_def_property_flag(parm, PROP_ENUM_FLAG); } diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index a5155adc14c..74fc2bda17b 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1179,7 +1179,7 @@ static void rna_def_medge(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Seam", "Seam edge for UV unwrapping"); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); - prop= RNA_def_property(srna, "use_sharp", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_edge_sharp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_SHARP); RNA_def_property_ui_text(prop, "Sharp", "Sharp edge for the EdgeSplit modifier"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); @@ -1743,11 +1743,11 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_struct_type(prop, "MeshStringPropertyLayer"); RNA_def_property_ui_text(prop, "String Property Layers", ""); - prop= RNA_def_property(srna, "autosmooth", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_smooth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_AUTOSMOOTH); RNA_def_property_ui_text(prop, "Auto Smooth", "Treats all set-smoothed faces with angles less than the specified angle as 'smooth' during render"); - prop= RNA_def_property(srna, "autosmooth_angle", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "auto_smooth_angle", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "smoothresh"); RNA_def_property_range(prop, 1, 80); RNA_def_property_ui_text(prop, "Auto Smooth Angle", "Defines maximum angle between face normals that 'Auto Smooth' will operate on"); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index f8da299ec8e..ccf6f2c1c3b 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -592,7 +592,7 @@ static void rna_def_modifier_subsurf(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Optimal Display", "Skip drawing/rendering of interior subdivided edges"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "subsurf_uv", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_subsurf_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", eSubsurfModifierFlag_SubsurfUv); RNA_def_property_ui_text(prop, "Subdivide UVs", "Use subsurf to subdivide UVs"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -770,22 +770,22 @@ static void rna_def_modifier_mirror(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Clip", "Prevents vertices from going through the mirror during transform"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "mirror_vertex_groups", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mirror_vertex_groups", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_VGROUP); RNA_def_property_ui_text(prop, "Mirror Vertex Groups", "Mirror vertex groups (e.g. .R->.L)"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "mirror_u", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mirror_u", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MIRROR_U); RNA_def_property_ui_text(prop, "Mirror U", "Mirror the U texture coordinate around the 0.5 point"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "mirror_v", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mirror_v", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MIRROR_V); RNA_def_property_ui_text(prop, "Mirror V", "Mirror the V texture coordinate around the 0.5 point"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "merge_limit", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "tolerance"); RNA_def_property_range(prop, 0, FLT_MAX); RNA_def_property_ui_range(prop, 0, 1, 0.01, 6); @@ -858,17 +858,17 @@ static void rna_def_modifier_wave(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Normals", "Displace along normals"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "x_normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_normal_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_X); RNA_def_property_ui_text(prop, "X Normal", "Enable displacement along the X normal"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "y_normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_normal_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_Y); RNA_def_property_ui_text(prop, "Y Normal", "Enable displacement along the Y normal"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "z_normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_normal_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM_Z); RNA_def_property_ui_text(prop, "Z Normal", "Enable displacement along the Z normal"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -880,6 +880,7 @@ static void rna_def_modifier_wave(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop= RNA_def_property(srna, "lifetime", PROP_FLOAT, PROP_TIME); + RNA_def_property_float_sdna(prop, NULL, "lifetime"); RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF); RNA_def_property_ui_text(prop, "Lifetime", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -928,7 +929,7 @@ static void rna_def_modifier_wave(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texmapping"); RNA_def_property_enum_items(prop, prop_texture_coordinates_items); RNA_def_property_ui_text(prop, "Texture Coordinates", "Texture coordinates used for modulating input"); @@ -1014,7 +1015,7 @@ static void rna_def_modifier_armature(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Quaternion", "Deform rotation interpolation with quaternions"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "multi_modifier", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_multi_modifier", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "multi", 0); RNA_def_property_ui_text(prop, "Multi Modifier", "Use same input as previous modifier, and mix results using overall vgroup"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1151,38 +1152,38 @@ static void rna_def_modifier_array(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update"); /* Offset parameters */ - prop= RNA_def_property(srna, "constant_offset", PROP_BOOLEAN, PROP_TRANSLATION); + prop= RNA_def_property(srna, "use_constant_offset", PROP_BOOLEAN, PROP_TRANSLATION); RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_CONST); RNA_def_property_ui_text(prop, "Constant Offset", "Add a constant offset"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "constant_offset_displacement", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "constant_offset_displace", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "offset"); RNA_def_property_ui_text(prop, "Constant Offset Displacement", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "relative_offset", PROP_BOOLEAN, PROP_TRANSLATION); + prop= RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, PROP_TRANSLATION); RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_RELATIVE); RNA_def_property_ui_text(prop, "Relative Offset", "Add an offset relative to the object's bounding box"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "relative_offset_displacement", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "relative_offset_displace", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "scale"); RNA_def_property_ui_text(prop, "Relative Offset Displacement", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); /* Vertex merging parameters */ - prop= RNA_def_property(srna, "merge_adjacent_vertices", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_merge_vertices", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_ARR_MERGE); RNA_def_property_ui_text(prop, "Merge Vertices", "Merge vertices in adjacent duplicates"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "merge_end_vertices", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_merge_vertices_cap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_ARR_MERGEFINAL); RNA_def_property_ui_text(prop, "Merge Vertices", "Merge vertices in first and last duplicates"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "merge_distance", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "merge_dist"); RNA_def_property_range(prop, 0, FLT_MAX); RNA_def_property_ui_range(prop, 0, 1, 1, 4); @@ -1190,7 +1191,7 @@ static void rna_def_modifier_array(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); /* Offset object */ - prop= RNA_def_property(srna, "add_offset_object", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_object_offset", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_OBJ); RNA_def_property_ui_text(prop, "Object Offset", "Add another object's transformation to the total offset"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1237,7 +1238,7 @@ static void rna_def_modifier_edgesplit(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Edge Angle", "Split edges with high angle between faces"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "use_sharp", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_edge_sharp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_EDGESPLIT_FROMFLAG); RNA_def_property_ui_text(prop, "Use Sharp Edges", "Split edges that are marked as sharp"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1279,7 +1280,8 @@ static void rna_def_modifier_displace(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "midlevel", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "mid_level", PROP_FLOAT, PROP_DISTANCE); + RNA_def_property_float_sdna(prop, NULL, "midlevel"); RNA_def_property_range(prop, 0, 1); RNA_def_property_ui_range(prop, 0, 1, 10, 3); RNA_def_property_ui_text(prop, "Midlevel", "Material value that gives no displacement"); @@ -1296,7 +1298,7 @@ static void rna_def_modifier_displace(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Direction", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texmapping"); RNA_def_property_enum_items(prop, prop_texture_coordinates_items); RNA_def_property_ui_text(prop, "Texture Coordinates", ""); @@ -1331,7 +1333,8 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_UVProjectModifier_uvlayer_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "num_projectors", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "projector_count", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "num_projectors"); RNA_def_property_ui_text(prop, "Number of Projectors", "Number of projectors to use"); RNA_def_property_int_funcs(prop, NULL, "rna_UVProjectModifier_num_projectors_set", NULL); RNA_def_property_range(prop, 1, MOD_UVPROJECT_MAX); @@ -1375,7 +1378,7 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertical Scale", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "override_image", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_image_override", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_UVPROJECT_OVERRIDEIMAGE); RNA_def_property_ui_text(prop, "Override Image", "Override faces' current images with the given image"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1478,7 +1481,7 @@ static void rna_def_modifier_cast(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Z", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "from_radius", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_radius_as_size", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_SIZE_FROM_RADIUS); RNA_def_property_ui_text(prop, "From Radius", "Use radius as size of projection shape (0 = auto)"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1610,7 +1613,7 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK); RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update"); - prop= RNA_def_property(srna, "particle_system_number", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "particle_system_index", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "psys"); RNA_def_property_range(prop, 1, 10); RNA_def_property_ui_text(prop, "Particle System Number", ""); @@ -1652,7 +1655,7 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dead", "Show instances when particles are dead"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "keep_shape", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_preserve_shape", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_KeepShape); RNA_def_property_ui_text(prop, "Keep Shape", "Don't stretch the object"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1694,7 +1697,7 @@ static void rna_def_modifier_explode(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Protect", "Clean vertex group edges"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "split_edges", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_edge_split", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_EdgeSplit); RNA_def_property_ui_text(prop, "Split Edges", "Split face edges for nicer shrapnel"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1827,7 +1830,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Width", "Bevel value/amount"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "only_vertices", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_only_vertices", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", BME_BEVEL_VERT); RNA_def_property_ui_text(prop, "Only Vertices", "Bevel verts/corners, not edges"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1932,17 +1935,17 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Positive", "Allow vertices to move in the positive direction of axis"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "cull_front_faces", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cull_front_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE); RNA_def_property_ui_text(prop, "Cull Front Faces", "Stop vertices from projecting to a front face on the target"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "cull_back_faces", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cull_back_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_CULL_TARGET_BACKFACE); RNA_def_property_ui_text(prop, "Cull Back Faces", "Stop vertices from projecting to a back face on the target"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "keep_above_surface", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_keep_above_surface", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE); RNA_def_property_ui_text(prop, "Keep Above Surface", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2055,12 +2058,12 @@ static void rna_def_modifier_simpledeform(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Limits", "Lower/Upper limits for deform"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "lock_x_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_X); RNA_def_property_ui_text(prop, "Lock X Axis", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "lock_y_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "axis", MOD_SIMPLEDEFORM_LOCK_AXIS_Y); RNA_def_property_ui_text(prop, "Lock Y Axis", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index ecd9736f4fd..a812169e951 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -314,7 +314,7 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_enum_items(prop, nla_mode_extend_items); RNA_def_property_ui_text(prop, "Extrapolation", "Action to take for gaps past the strip extents"); - prop= RNA_def_property(srna, "blending", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "blendmode"); RNA_def_property_enum_items(prop, nla_mode_blend_items); RNA_def_property_ui_text(prop, "Blending", "Method used for combining strip's result with accumulated result"); @@ -343,7 +343,7 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_float_funcs(prop, NULL, "rna_NlaStrip_blend_out_set", NULL); RNA_def_property_ui_text(prop, "Blend Out", ""); - prop= RNA_def_property(srna, "auto_blending", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_blend", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_AUTO_BLENDS); RNA_def_property_ui_text(prop, "Auto Blend In/Out", "Number of frames for Blending In/Out is automatically determined from overlapping strips"); @@ -401,17 +401,17 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Strip Time", "Frame of referenced Action to evaluate"); // TODO: should the animated_influence/time settings be animatable themselves? - prop= RNA_def_property(srna, "animated_influence", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_animated_influence", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_USR_INFLUENCE); RNA_def_property_boolean_funcs(prop, NULL, "rna_NlaStrip_animated_influence_set"); RNA_def_property_ui_text(prop, "Animated Influence", "Influence setting is controlled by an F-Curve rather than automatically determined"); - prop= RNA_def_property(srna, "animated_time", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_animated_time", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_USR_TIME); RNA_def_property_boolean_funcs(prop, NULL, "rna_NlaStrip_animated_time_set"); RNA_def_property_ui_text(prop, "Animated Strip Time", "Strip time is controlled by an F-Curve rather than automatically determined"); - prop= RNA_def_property(srna, "animated_time_cyclic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_animated_time_cyclic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_USR_TIME_CYCLIC); RNA_def_property_ui_text(prop, "Cyclic Strip Time", "Cycle the animated time within the action start & end"); RNA_def_property_update(prop, 0, "rna_NlaStrip_transform_update"); // is there a better update flag? diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index b3714c3d4ed..e0507fc5401 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -765,23 +765,23 @@ static void def_sh_mapping(StructRNA *srna) RNA_def_property_ui_range(prop, -10.f, 10.f, 0.1f, 2); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_mapping_update"); - prop = RNA_def_property(srna, "clamp_minimum", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_min", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MIN); RNA_def_property_ui_text(prop, "Clamp Minimum", "Clamp the output coordinate to a minimum value"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop= RNA_def_property(srna, "minimum", PROP_FLOAT, PROP_XYZ); + prop= RNA_def_property(srna, "min", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "min"); RNA_def_property_ui_text(prop, "Minimum", "Minimum value to clamp coordinate to"); RNA_def_property_ui_range(prop, -10.f, 10.f, 0.1f, 2); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "clamp_maximum", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_max", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MAX); RNA_def_property_ui_text(prop, "Clamp Maximum", "Clamp the output coordinate to a maximum value"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop= RNA_def_property(srna, "maximum", PROP_FLOAT, PROP_XYZ); + prop= RNA_def_property(srna, "max", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "max"); RNA_def_property_ui_text(prop, "Maximum", "Maximum value to clamp coordinate to"); RNA_def_property_ui_range(prop, -10.f, 10.f, 0.1f, 2); @@ -813,7 +813,7 @@ static void def_cmp_alpha_over(StructRNA *srna) PropertyRNA *prop; // XXX: Tooltip - prop = RNA_def_property(srna, "convert_premul", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); RNA_def_property_ui_text(prop, "Convert Premul", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -869,13 +869,13 @@ static void def_cmp_blur(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeBlurData", "storage"); - prop = RNA_def_property(srna, "sizex", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "size_x", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sizex"); RNA_def_property_range(prop, 0, 256); RNA_def_property_ui_text(prop, "Size X", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "sizey", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "size_y", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sizey"); RNA_def_property_range(prop, 0, 256); RNA_def_property_ui_text(prop, "Size Y", ""); @@ -990,13 +990,13 @@ static void def_cmp_vector_blur(StructRNA *srna) RNA_def_property_ui_text(prop, "Samples", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "min_speed", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "speed_min", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "minspeed"); RNA_def_property_range(prop, 0, 1024); RNA_def_property_ui_text(prop, "Min Speed", "Minimum speed for a pixel to be blurred; used to separate background from foreground"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "max_speed", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "speed_max", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "maxspeed"); RNA_def_property_range(prop, 0, 1024); RNA_def_property_ui_text(prop, "Max Speed", "Maximum speed, or zero for none"); @@ -1078,7 +1078,7 @@ static void def_cmp_image(StructRNA *srna) RNA_def_property_ui_text(prop, "Cyclic", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "auto_refresh", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_auto_refresh", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_ANIM_ALWAYS); RNA_def_property_ui_text(prop, "Auto-Refresh", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1148,7 +1148,7 @@ static void def_cmp_output_file(StructRNA *srna) RNA_def_property_ui_text(prop, "Image Type", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "exr_half", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_exr_half", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_OPENEXR_HALF); RNA_def_property_ui_text(prop, "Half", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1320,7 +1320,7 @@ static void def_cmp_color_spill(StructRNA *srna) RNA_def_property_ui_text(prop, "Channel", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "algorithm", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "limit_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom2"); RNA_def_property_enum_items(prop, algorithm_items); RNA_def_property_ui_text(prop, "Algorithm", ""); @@ -1340,7 +1340,7 @@ static void def_cmp_color_spill(StructRNA *srna) RNA_def_property_ui_text(prop, "Ratio", "Scale limit by value"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "unspill", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_unspill", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "unspill", 0); RNA_def_property_ui_text(prop, "Unspill", "Compensate all channels (diffenrently) by hand"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1391,7 +1391,7 @@ static void def_cmp_chroma_matte(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeChroma", "storage"); - prop = RNA_def_property(srna, "acceptance", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "tolerance", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "t1"); RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t1_set", NULL); RNA_def_property_range(prop, 1.0f, 80.0f); @@ -1455,7 +1455,7 @@ static void def_cmp_channel_matte(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeChroma", "storage"); - prop = RNA_def_property(srna, "algorithm", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "limit_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "algorithm"); RNA_def_property_enum_items(prop, algorithm_items); RNA_def_property_ui_text(prop, "Algorithm", "Algorithm to use to limit channel"); @@ -1567,7 +1567,7 @@ static void def_cmp_defocus(StructRNA *srna) RNA_def_property_ui_text(prop, "Angle", "Bokeh shape rotation offset in degrees"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "gamma_correction", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_gamma_correction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gamco", 1); RNA_def_property_ui_text(prop, "Gamma Correction", "Enable gamma correction before and after main process"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1579,7 +1579,7 @@ static void def_cmp_defocus(StructRNA *srna) RNA_def_property_ui_text(prop, "fStop", "Amount of focal blur, 128=infinity=perfect focus, half the value doubles the blur radius"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "max_blur", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "blur_max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "maxblur"); RNA_def_property_range(prop, 0.0f, 10000.0f); RNA_def_property_ui_text(prop, "Max Blur", "blur limit, maximum CoC radius, 0=no limit"); @@ -1633,32 +1633,32 @@ static void def_cmp_crop(StructRNA *srna) { PropertyRNA *prop; - prop = RNA_def_property(srna, "crop_size", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_crop_size", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); RNA_def_property_ui_text(prop, "Crop Image Size", "Whether to crop the size of the input image"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); RNA_def_struct_sdna_from(srna, "NodeTwoXYs", "storage"); - prop = RNA_def_property(srna, "x1", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "min_x", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "x1"); RNA_def_property_range(prop, 0, 10000); RNA_def_property_ui_text(prop, "X1", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "x2", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "max_x", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "x2"); RNA_def_property_range(prop, 0, 10000); RNA_def_property_ui_text(prop, "X2", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "y1", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "min_y", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "y1"); RNA_def_property_range(prop, 0, 10000); RNA_def_property_ui_text(prop, "Y1", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "y2", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "max_y", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "y2"); RNA_def_property_range(prop, 0, 10000); RNA_def_property_ui_text(prop, "Y2", ""); @@ -1834,7 +1834,7 @@ static void def_cmp_glare(StructRNA *srna) RNA_def_property_ui_text(prop, "Fade", "Streak fade-out factor"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "rotate_45", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_rotate_45", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "angle", 1); RNA_def_property_ui_text(prop, "Rotate 45", "Simple star filter: add 45 degree rotation offset"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1914,7 +1914,7 @@ static void def_cmp_lensdist(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeLensDist", "storage"); - prop = RNA_def_property(srna, "projector", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_projector", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "proj", 1); RNA_def_property_ui_text(prop, "Projector", "Enable/disable projector mode. Effect is applied in horizontal direction only"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1940,7 +1940,7 @@ static void def_cmp_colorbalance(StructRNA *srna) {1, "OFFSET_POWER_SLOPE", 0, "Offset/Power/Slope (ASC-CDL)", "ASC-CDL standard color correction"}, {0, NULL, 0, NULL, NULL}}; - prop = RNA_def_property(srna, "correction_formula", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "correction_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom1"); RNA_def_property_enum_items(prop, type_items); RNA_def_property_ui_text(prop, "Correction Formula", ""); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 5fc3e571045..dc8cd2d7a03 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1907,7 +1907,7 @@ static void rna_def_object(BlenderRNA *brna) /* duplicates */ // XXX: evil old crap - prop= RNA_def_property(srna, "slow_parent", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_slow_parent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "partype", PARSLOW); RNA_def_property_ui_text(prop, "Slow Parent", "Create a delay in the parent relationship"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); @@ -1923,7 +1923,7 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dupli Frames Speed", "Set dupliframes to use the frame"); // TODO, better descriptio! RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_internal_update"); - prop= RNA_def_property(srna, "use_dupli_verts_rotation", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_dupli_vertices_rotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIROT); RNA_def_property_ui_text(prop, "Dupli Verts Rotation", "Rotate dupli according to vertex normal"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); @@ -1987,27 +1987,27 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Time Offset", "Animation offset in frames for F-Curve and dupligroup instances"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); - prop= RNA_def_property(srna, "time_offset_edit", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_time_offset_edit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_OB); RNA_def_property_ui_text(prop, "Time Offset Edit", "Use time offset when inserting keys and display time offset for F-Curve and action views"); - prop= RNA_def_property(srna, "time_offset_parent", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_time_offset_parent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_PARENT); RNA_def_property_ui_text(prop, "Time Offset Parent", "Apply the time offset to this objects parent relationship"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); - prop= RNA_def_property(srna, "time_offset_particle", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_time_offset_particle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_PARTICLE); RNA_def_property_ui_text(prop, "Time Offset Particle", "Let the time offset work on the particle effect"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); - prop= RNA_def_property(srna, "time_offset_add_parent", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_time_offset_add_parent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ipoflag", OB_OFFS_PARENTADD); RNA_def_property_ui_text(prop, "Time Offset Add Parent", "Add the parents time offset value"); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); /* drawing */ - prop= RNA_def_property(srna, "max_draw_type", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "draw_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dt"); RNA_def_property_enum_items(prop, drawtype_items); RNA_def_property_ui_text(prop, "Maximum Draw Type", "Maximum draw type to display object with in viewport"); @@ -2079,7 +2079,7 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1); RNA_def_property_update(prop, 0, "rna_Object_internal_update_data"); - prop= RNA_def_property(srna, "shape_key_edit_mode", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shape_key_edit_mode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shapeflag", OB_SHAPE_EDIT_MODE); RNA_def_property_ui_text(prop, "Shape Key Edit Mode", "Apply shape keys in edit mode (for Meshes only)"); RNA_def_property_ui_icon(prop, ICON_EDITMODE_HLT, 0); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 05c3ff72ab3..ded74c88dfb 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -815,7 +815,7 @@ static void rna_def_collision(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Damping Factor", "Amount of damping during particle collision"); RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); - prop= RNA_def_property(srna, "random_damping", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "damping_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "pdef_rdamp"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Damping", "Random variation of damping"); @@ -827,7 +827,7 @@ static void rna_def_collision(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Friction Factor", "Amount of friction during particle collision"); RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); - prop= RNA_def_property(srna, "random_friction", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "friction_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "pdef_rfrict"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Friction", "Random variation of friction"); @@ -839,7 +839,7 @@ static void rna_def_collision(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Permeability", "Chance that the particle will pass through the mesh"); RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); - prop= RNA_def_property(srna, "kill_particles", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_particle_kill", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PDEFLE_KILL_PART); RNA_def_property_ui_text(prop, "Kill Particles", "Kill collided particles"); RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); @@ -852,13 +852,13 @@ static void rna_def_collision(BlenderRNA *brna) /* Soft Body and Cloth Interaction */ - prop= RNA_def_property(srna, "inner_thickness", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "thickness_inner", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "pdef_sbift"); RNA_def_property_range(prop, 0.001f, 1.0f); RNA_def_property_ui_text(prop, "Inner Thickness", "Inner face thickness"); RNA_def_property_update(prop, 0, "rna_CollisionSettings_update"); - prop= RNA_def_property(srna, "outer_thickness", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "thickness_outer", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "pdef_sboft"); RNA_def_property_range(prop, 0.001f, 1.0f); RNA_def_property_ui_text(prop, "Outer Thickness", "Outer face thickness"); @@ -1159,25 +1159,25 @@ static void rna_def_field(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Falloff Power", "Falloff power (real gravitational falloff = 2)"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "minimum_distance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "distance_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "mindist"); RNA_def_property_range(prop, 0.0f, 1000.0f); RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance for the field's fall-off"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "maximum_distance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "distance_max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "maxdist"); RNA_def_property_range(prop, 0.0f, 1000.0f); RNA_def_property_ui_text(prop, "Maximum Distance", "Maximum distance for the field to work"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "radial_minimum", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "radial_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "minrad"); RNA_def_property_range(prop, 0.0f, 1000.0f); RNA_def_property_ui_text(prop, "Minimum Radial Distance", "Minimum radial distance for the field's fall-off"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "radial_maximum", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "radial_max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "maxrad"); RNA_def_property_range(prop, 0.0f, 1000.0f); RNA_def_property_ui_text(prop, "Maximum Radial Distance", "Maximum radial distance for the field to work"); @@ -1230,42 +1230,42 @@ static void rna_def_field(BlenderRNA *brna) // "Use a maximum angle for the field to work" RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "use_coordinates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_object_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_TEX_OBJECT); RNA_def_property_ui_text(prop, "Use Coordinates", "Use object/global coordinates for texture"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "global_coordinates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_global_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_GLOBAL_CO); RNA_def_property_ui_text(prop, "Use Global Coordinates", "Use effector/global coordinates for turbulence"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "force_2d", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_2d_force", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_TEX_2D); RNA_def_property_ui_text(prop, "2D", "Apply force only in 2d"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "root_coordinates", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_root_coords", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_TEX_ROOTCO); RNA_def_property_ui_text(prop, "Root Texture Coordinates", "Texture coordinates from root particle locations"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "do_location", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "apply_to_location", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_DO_LOCATION); RNA_def_property_ui_text(prop, "Location", "Effect particles' location"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "do_rotation", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "apply_to_rotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_DO_ROTATION); RNA_def_property_ui_text(prop, "Rotation", "Effect particles' dynamic rotation"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "do_absorption", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_absorption", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_VISIBILITY); RNA_def_property_ui_text(prop, "Absorption", "Force gets absorbed by collision objects"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "multiple_springs", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_multiple_springs", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_MULTIPLE_SPRINGS); RNA_def_property_ui_text(prop, "Multiple Springs", "Every point is effected by multiple springs"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); @@ -1292,7 +1292,7 @@ static void rna_def_field(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Free", "Guide-free time from particle life's end"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); - prop= RNA_def_property(srna, "guide_path_add", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_guide_path_add", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_GUIDE_PATH_ADD); RNA_def_property_ui_text(prop, "Additive", "Based on distance/falloff it adds a portion of the entire path"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); @@ -1363,7 +1363,7 @@ static void rna_def_game_softbody(BlenderRNA *brna) /* Floats */ - prop= RNA_def_property(srna, "linstiff", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "linear_stiffness", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "linStiff"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Linear Stiffness", "Linear stiffness of the soft body links"); @@ -1390,7 +1390,7 @@ static void rna_def_game_softbody(BlenderRNA *brna) /* Integers */ - prop= RNA_def_property(srna, "position_iterations", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "location_iterations", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "piterations"); RNA_def_property_range(prop, 0, 10); RNA_def_property_ui_text(prop, "Position Iterations", "Position solver iterations"); @@ -1402,19 +1402,19 @@ static void rna_def_game_softbody(BlenderRNA *brna) /* Booleans */ - prop= RNA_def_property(srna, "shape_match", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shape_match", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_BSB_SHAPE_MATCHING); RNA_def_property_ui_text(prop, "Shape Match", "Enable soft body shape matching goal"); - prop= RNA_def_property(srna, "bending_const", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_bending_constraints", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_BSB_BENDING_CONSTRAINTS); RNA_def_property_ui_text(prop, "Bending Const", "Enable bending constraints"); - prop= RNA_def_property(srna, "cluster_rigid_to_softbody", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cluster_rigid_to_softbody", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "collisionflags", OB_BSB_COL_CL_RS); RNA_def_property_ui_text(prop, "Rigid to Soft Body", "Enable cluster collision between soft and rigid body"); - prop= RNA_def_property(srna, "cluster_soft_to_softbody", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cluster_soft_to_softbody", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "collisionflags", OB_BSB_COL_CL_SS); RNA_def_property_ui_text(prop, "Soft to Soft Body", "Enable cluster collision between soft and soft body"); } @@ -1554,7 +1554,7 @@ static void rna_def_softbody(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Plastic", "Permanent deform"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "bending", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "bend", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "secondspring"); RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_text(prop, "Bending", "Bending Stiffness"); @@ -1601,19 +1601,19 @@ static void rna_def_softbody(BlenderRNA *brna) /* Solver */ - prop= RNA_def_property(srna, "error_limit", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "error_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "rklimit"); RNA_def_property_range(prop, 0.001f, 10.0f); RNA_def_property_ui_text(prop, "Error Limit", "The Runge-Kutta ODE solver error limit, low value gives more precision, high values speed"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "minstep", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "step_min", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "minloops"); RNA_def_property_range(prop, 0, 30000); RNA_def_property_ui_text(prop, "Min Step", "Minimal # solver steps/frame"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "maxstep", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "step_max", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "maxloops"); RNA_def_property_range(prop, 0, 30000); RNA_def_property_ui_text(prop, "Max Step", "Maximal # solver steps/frame"); @@ -1636,11 +1636,11 @@ static void rna_def_softbody(BlenderRNA *brna) RNA_def_property_ui_text(prop, "V", "Use velocities for automagic step sizes"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "diagnose", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_diagnose", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "solverflags", SBSO_MONITOR); RNA_def_property_ui_text(prop, "Print Performance to Console", "Turn on SB diagnose console prints"); - prop= RNA_def_property(srna, "estimate_matrix", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_estimate_matrix", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "solverflags", SBSO_ESTIMATEIPO); RNA_def_property_ui_text(prop, "Estimate matrix", "estimate matrix .. split to COM , ROT ,SCALE "); @@ -1650,17 +1650,17 @@ static void rna_def_softbody(BlenderRNA *brna) /* but i did not want to start a new property struct */ /* so rather rename this from SoftBodySettings to SoftBody */ /* translation */ - prop= RNA_def_property(srna, "lcom", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "location_mass_center", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "lcom"); RNA_def_property_ui_text(prop, "Center of mass", "Location of Center of mass"); /* matrix */ - prop= RNA_def_property(srna, "lrot", PROP_FLOAT, PROP_MATRIX); + prop= RNA_def_property(srna, "rotation_estimate", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "lrot"); RNA_def_property_multi_array(prop, 2, matrix_dimsize); RNA_def_property_ui_text(prop, "Rot Matrix", "Estimated rotation matrix"); - prop= RNA_def_property(srna, "lscale", PROP_FLOAT, PROP_MATRIX); + prop= RNA_def_property(srna, "scale_estimate", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "lscale"); RNA_def_property_multi_array(prop, 2, matrix_dimsize); RNA_def_property_ui_text(prop, "Scale Matrix", "Estimated scale matrix"); @@ -1681,18 +1681,18 @@ static void rna_def_softbody(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Edges", "Use Edges as springs"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "stiff_quads", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_stiff_quads", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_stiff_quads_get", "rna_SoftBodySettings_stiff_quads_set"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Stiff Quads", "Adds diagonal springs on 4-gons"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "edge_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_edge_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_edge_collision_get", "rna_SoftBodySettings_edge_collision_set"); RNA_def_property_ui_text(prop, "Edge Collision", "Edges collide too"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "face_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_face_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_face_collision_get", "rna_SoftBodySettings_face_collision_set"); RNA_def_property_ui_text(prop, "Face Collision", "Faces collide too, can be very slow"); RNA_def_property_update(prop, 0, "rna_softbody_update"); @@ -1703,7 +1703,7 @@ static void rna_def_softbody(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Aerodynamics Type", "Method of calculating aerodynamic interaction"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "self_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_self_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_SoftBodySettings_self_collision_get", "rna_SoftBodySettings_self_collision_set"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Self Collision", "Enable naive vertex ball self collision"); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 16696c25875..dd8f7196fb0 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -950,7 +950,7 @@ static void rna_def_fluid_settings(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "SPH Fluid Settings", "Settings for particle fluids physics"); /* Fluid settings */ - prop= RNA_def_property(srna, "spring_k", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "spring_force", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "spring_k"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Spring", "Spring force constant"); @@ -982,13 +982,13 @@ static void rna_def_fluid_settings(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Particle_reset"); /* Double density relaxation */ - prop= RNA_def_property(srna, "stiffness_k", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "stiffness", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "stiffness_k"); RNA_def_property_range(prop, 0.0f, 100.0f); RNA_def_property_ui_text(prop, "Stiffness ", "Constant K - Stiffness"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "stiffness_knear", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "stiffness_near", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "stiffness_knear"); RNA_def_property_range(prop, 0.0f, 100.0f); RNA_def_property_ui_text(prop, "Repulsion", "Repulsion factor: stiffness_knear"); @@ -1134,13 +1134,13 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_struct_ui_icon(srna, ICON_PARTICLE_DATA); /* flag */ - prop= RNA_def_property(srna, "react_start_end", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_react_start_end", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_REACT_STA_END); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Start/End", "Give birth to unreacted particles eventually"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "react_multiple", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_react_multiple", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_REACT_MULTIPLE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Multi React", "React multiple times"); @@ -1151,7 +1151,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Unborn", "Show particles before they are emitted"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "died", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_dead", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_DIED); RNA_def_property_ui_text(prop, "Died", "Show particles after they have died"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -1162,67 +1162,67 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Random", "Emit in random order of elements"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "even_distribution", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_even_distribution", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_EDISTR); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Even Distribution", "Use even distribution from faces based on face areas or edge lengths"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "die_on_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_die_on_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_DIE_ON_COL); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Die on hit", "Particles die when they collide with a deflector object"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "size_deflect", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_size_deflect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SIZE_DEFL); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Size Deflect", "Use particle's size in deflection"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "rotation_dynamic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_dynamic_rotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_ROT_DYN); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Dynamic", "Sets rotation to dynamic/constant"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "sizemass", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_multiply_size_mass", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SIZEMASS); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Mass from Size", "Multiply mass by particle size"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "boids_2d", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_boids_to_surface", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_BOIDS_2D); RNA_def_property_ui_text(prop, "Boids 2D", "Constrain boids to a surface"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "branching", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_branching", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_BRANCHING); RNA_def_property_ui_text(prop, "Branching", "Branch child paths from each other"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "animate_branching", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_animate_branching", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_ANIM_BRANCHING); RNA_def_property_ui_text(prop, "Animated", "Animate branching"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "symmetric_branching", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_symmetric_branching", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SYMM_BRANCHING); RNA_def_property_ui_text(prop, "Symmetric", "Start and end points are the same"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "hair_bspline", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_hair_bspline", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_HAIR_BSPLINE); RNA_def_property_ui_text(prop, "B-Spline", "Interpolate hair using B-Splines"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "grid_invert", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_grid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_GRID_INVERT); RNA_def_property_ui_text(prop, "Invert", "Invert what is considered object and what is not"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "child_effector", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "apply_effector_to_children", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_CHILD_EFFECT); RNA_def_property_ui_text(prop, "Children", "Apply effectors to children"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -1232,12 +1232,12 @@ static void rna_def_particle_settings(BlenderRNA *brna) //RNA_def_property_ui_text(prop, "Use seams", "Use seams to determine parents"); //RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "child_guide", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "apply_guide_to_children", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_CHILD_GUIDE); - RNA_def_property_ui_text(prop, "child_guide", ""); + RNA_def_property_ui_text(prop, "apply_guide_to_children", ""); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "self_effect", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_self_effect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_SELF_EFFECT); RNA_def_property_ui_text(prop, "Self Effect", "Particle effectors effect themselves"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -1314,12 +1314,12 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Health", "Draw boid health"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "abs_path_time", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_absolute_path_time", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_ABS_PATH_TIME); RNA_def_property_ui_text(prop, "Absolute Path Time", "Path timing is in absolute frames"); RNA_def_property_update(prop, 0, "rna_Particle_abspathtime_update"); - prop= RNA_def_property(srna, "billboard_lock", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_billboard", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_BB_LOCK); RNA_def_property_ui_text(prop, "Lock Billboard", "Lock the billboards align axis"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -1334,7 +1334,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Number", "Show particle number"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "rand_group", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_group_pick_random", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_RAND_GR); RNA_def_property_ui_text(prop, "Pick Random", "Pick objects from group randomly"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -1349,12 +1349,12 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Global", "Use object's global coordinates for duplication"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "render_adaptive", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_render_adaptive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_REN_ADAPT); RNA_def_property_ui_text(prop, "Adaptive render", "Draw steps of the particle path"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "velocity_length", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_velocity_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_VEL_LENGTH); RNA_def_property_ui_text(prop, "Speed", "Multiply line length by particle speed"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -1364,24 +1364,24 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Material Color", "Draw particles using material's diffuse color"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "whole_group", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_whole_group", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_WHOLE_GR); RNA_def_property_ui_text(prop, "Whole Group", "Use whole group at once"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "render_strand", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_strand_primitive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_REN_STRAND); RNA_def_property_ui_text(prop, "Strand render", "Use the strand primitive for rendering"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "draw_as", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "draw_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "draw_as"); RNA_def_property_enum_items(prop, part_draw_as_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Particle_draw_as_itemf"); RNA_def_property_ui_text(prop, "Particle Drawing", "How particles are drawn in viewport"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "ren_as", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "render_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ren_as"); RNA_def_property_enum_items(prop, part_ren_as_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Particle_ren_as_itemf"); @@ -1429,7 +1429,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_range(prop, 0, 45); RNA_def_property_ui_text(prop, "Degrees", "How many degrees path has to curve to make another render segment"); - prop= RNA_def_property(srna, "adaptive_pix", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "adaptive_pixel", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "adapt_pix"); RNA_def_property_range(prop, 0, 50); RNA_def_property_ui_text(prop, "Pixel", "How many pixels path has to cover to make another render segment"); @@ -1488,7 +1488,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_enum_items(prop, bb_anim_items); RNA_def_property_ui_text(prop, "Animate", "How to animate billboard textures"); - prop= RNA_def_property(srna, "billboard_split_offset", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "billboard_offset_split", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "bb_split_offset"); RNA_def_property_enum_items(prop, bb_split_offset_items); RNA_def_property_ui_text(prop, "Offset", "How to offset billboard textures"); @@ -1499,7 +1499,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Tilt", "Tilt of the billboards"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "billboard_random_tilt", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "billboard_tilt_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "bb_rand_tilt"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Tilt", "Random tilt of the billboards"); @@ -1514,7 +1514,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Particle_redo"); /* simplification */ - prop= RNA_def_property(srna, "enable_simplify", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_simplify", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "simplify_flag", PART_SIMPLIFY_ENABLE); RNA_def_property_ui_text(prop, "Child Simplification", "Remove child strands as the object becomes smaller on the screen"); @@ -1562,7 +1562,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Lifetime", "Specify the life span of the particles"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "random_lifetime", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "lifetime_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "randlife"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random", "Give the particle life a random variation"); @@ -1634,7 +1634,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Object", "Let the object give the particle a starting speed"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "random_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "factor_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "randfac");//optional if prop names are the same RNA_def_property_range(prop, 0.0f, 200.0f); RNA_def_property_ui_range(prop, 0, 100, 1, 3); @@ -1667,7 +1667,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Reactor", "Let the vector away from the target particles location give the particle a starting speed"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "object_aligned_factor", PROP_FLOAT, PROP_VELOCITY); + prop= RNA_def_property(srna, "object_align_factor", PROP_FLOAT, PROP_VELOCITY); RNA_def_property_float_sdna(prop, NULL, "ob_vel"); RNA_def_property_array(prop, 3); RNA_def_property_range(prop, -200.0f, 200.0f); @@ -1688,13 +1688,13 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Phase", "Initial rotation phase"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "random_rotation_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "rotation_factor_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "randrotfac"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Rotation", "Randomize rotation"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "random_phase_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "phase_factor_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "randphasefac"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Phase", "Randomize rotation phase"); @@ -1714,7 +1714,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Size", "The size of the particles"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "random_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "size_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "randsize"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Size", "Give the particle size a random variation"); @@ -1741,14 +1741,14 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Brownian", "Specify the amount of Brownian motion"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "damp_factor", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "damping", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "dampfac"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Damp", "Specify the amount of damping"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); /* random length */ - prop= RNA_def_property(srna, "random_length", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "length_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "randlength"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Length", "Give path length a random variation"); @@ -1762,7 +1762,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Children Per Parent", "Amount of children/parent"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "rendered_child_nbr", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "rendered_child_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ren_child_nbr"); RNA_def_property_range(prop, 0, 100000); RNA_def_property_ui_range(prop, 0, 10000, 1, 0); @@ -1781,7 +1781,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Child Size", "A multiplier for the child particle size"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "child_random_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "child_size_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "childrandsize"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Random Child Size", "Random variation to the size of the child particles"); @@ -1806,7 +1806,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Clump", "Amount of clumping"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "clumppow", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "clump_shape", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "clumppow"); RNA_def_property_range(prop, -0.999f, 0.999f); RNA_def_property_ui_text(prop, "Shape", "Shape of clumping"); @@ -1835,46 +1835,49 @@ static void rna_def_particle_settings(BlenderRNA *brna) /* rough */ - prop= RNA_def_property(srna, "rough1", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "roughness_1", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "rough1"); RNA_def_property_range(prop, 0.0f, 100000.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3); RNA_def_property_ui_text(prop, "Rough1", "Amount of location dependent rough"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "rough1_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "roughness_1_size", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "rough1_size"); RNA_def_property_range(prop, 0.01f, 100000.0f); RNA_def_property_ui_range(prop, 0.01f, 10.0f, 0.1, 3); RNA_def_property_ui_text(prop, "Size1", "Size of location dependent rough"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "rough2", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "roughness_2", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "rough2"); RNA_def_property_range(prop, 0.0f, 100000.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3); RNA_def_property_ui_text(prop, "Rough2", "Amount of random rough"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "rough2_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "roughness_2_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "rough2_size"); RNA_def_property_range(prop, 0.01f, 100000.0f); RNA_def_property_ui_range(prop, 0.01f, 10.0f, 0.1, 3); RNA_def_property_ui_text(prop, "Size2", "Size of random rough"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "rough2_thres", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "roughness_2_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "rough2_thres"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Threshold", "Amount of particles left untouched by random rough"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "rough_endpoint", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "roughness_endpoint", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "rough_end"); RNA_def_property_range(prop, 0.0f, 100000.0f); RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3); RNA_def_property_ui_text(prop, "Rough Endpoint", "Amount of end point rough"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "rough_end_shape", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "roughness_end_shape", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "rough_end_shape"); RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_text(prop, "Shape", "Shape of end point rough"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); @@ -1885,7 +1888,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Length", "Length of child paths"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "child_length_thres", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "child_length_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "clength_thres"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Threshold", "Amount of particles left untouched by child path length"); @@ -2112,7 +2115,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Global Hair", "Hair keys are in global coordinate space"); - prop= RNA_def_property(srna, "hair_dynamics", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_hair_dynamics", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_HAIR_DYNAMICS); RNA_def_property_ui_text(prop, "Hair Dynamics", "Enable hair dynamics using cloth simulation"); RNA_def_property_update(prop, 0, "rna_Particle_hair_dynamics"); @@ -2138,7 +2141,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Particle_reset"); /* keyed */ - prop= RNA_def_property(srna, "keyed_timing", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_keyed_timing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_KEYED_TIMING); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Keyed timing", "Use key times"); @@ -2189,7 +2192,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Density", "Vertex group to control density"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "vertex_group_density_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_density", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_DENSITY)); RNA_def_property_ui_text(prop, "Vertex Group Density Negate", "Negate the effect of the density vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -2199,7 +2202,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Velocity", "Vertex group to control velocity"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "vertex_group_velocity_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_velocity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_VEL)); RNA_def_property_ui_text(prop, "Vertex Group Velocity Negate", "Negate the effect of the velocity vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -2209,7 +2212,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Length", "Vertex group to control length"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "vertex_group_length_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_LENGTH)); RNA_def_property_ui_text(prop, "Vertex Group Length Negate", "Negate the effect of the length vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -2219,7 +2222,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Clump", "Vertex group to control clump"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "vertex_group_clump_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_clump", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_CLUMP)); RNA_def_property_ui_text(prop, "Vertex Group Clump Negate", "Negate the effect of the clump vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); @@ -2229,27 +2232,27 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Kink", "Vertex group to control kink"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "vertex_group_kink_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_kink", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_KINK)); RNA_def_property_ui_text(prop, "Vertex Group Kink Negate", "Negate the effect of the kink vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "vertex_group_roughness1", PROP_STRING, PROP_NONE); + prop= RNA_def_property(srna, "vertex_group_roughness_1", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_ParticleVGroup_name_get_5", "rna_ParticleVGroup_name_len_5", "rna_ParticleVGroup_name_set_5"); RNA_def_property_ui_text(prop, "Vertex Group Roughness 1", "Vertex group to control roughness 1"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "vertex_group_roughness1_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_roughness_1", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROUGH1)); RNA_def_property_ui_text(prop, "Vertex Group Roughness 1 Negate", "Negate the effect of the roughness 1 vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "vertex_group_roughness2", PROP_STRING, PROP_NONE); + prop= RNA_def_property(srna, "vertex_group_roughness_2", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_ParticleVGroup_name_get_6", "rna_ParticleVGroup_name_len_6", "rna_ParticleVGroup_name_set_6"); RNA_def_property_ui_text(prop, "Vertex Group Roughness 2", "Vertex group to control roughness 2"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "vertex_group_roughness2_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_roughness_2", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROUGH2)); RNA_def_property_ui_text(prop, "Vertex Group Roughness 2 Negate", "Negate the effect of the roughness 2 vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); @@ -2259,7 +2262,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Roughness End", "Vertex group to control roughness end"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop= RNA_def_property(srna, "vertex_group_roughness_end_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_roughness_end", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROUGHE)); RNA_def_property_ui_text(prop, "Vertex Group Roughness End Negate", "Negate the effect of the roughness end vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); @@ -2269,7 +2272,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Size", "Vertex group to control size"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "vertex_group_size_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_size", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_SIZE)); RNA_def_property_ui_text(prop, "Vertex Group Size Negate", "Negate the effect of the size vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -2279,7 +2282,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Tangent", "Vertex group to control tangent"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "vertex_group_tangent_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_tangent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_TAN)); RNA_def_property_ui_text(prop, "Vertex Group Tangent Negate", "Negate the effect of the tangent vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -2289,7 +2292,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Rotation", "Vertex group to control rotation"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "vertex_group_rotation_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_rotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_ROT)); RNA_def_property_ui_text(prop, "Vertex Group Rotation Negate", "Negate the effect of the rotation vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); @@ -2299,7 +2302,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Group Field", "Vertex group to control field"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "vertex_group_field_negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group_field", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "vg_neg", (1 << PSYS_VG_EFFECTOR)); RNA_def_property_ui_text(prop, "Vertex Group Field Negate", "Negate the effect of the field vertex group"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 733a581c711..ce797f21494 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -830,31 +830,31 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update"); - prop= RNA_def_property(srna, "ik_limit_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_ik_limit_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_XLIMIT); RNA_def_property_ui_text(prop, "IK X Limit", "Limit movement around the X axis"); RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update"); - prop= RNA_def_property(srna, "ik_limit_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_ik_limit_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_YLIMIT); RNA_def_property_ui_text(prop, "IK Y Limit", "Limit movement around the Y axis"); RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update"); - prop= RNA_def_property(srna, "ik_limit_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_ik_limit_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_ZLIMIT); RNA_def_property_ui_text(prop, "IK Z Limit", "Limit movement around the Z axis"); RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update"); - prop= RNA_def_property(srna, "ik_rot_control", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_ik_rotation_control", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_ROTCTL); RNA_def_property_ui_text(prop, "IK rot control", "Apply channel rotation as IK constraint"); RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update"); - prop= RNA_def_property(srna, "ik_lin_control", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_ik_linear_control", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_LINCTL); RNA_def_property_ui_text(prop, "IK rot control", "Apply channel size as IK constraint if stretching is enabled"); RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); @@ -930,14 +930,14 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update"); - prop= RNA_def_property(srna, "ik_rot_weight", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "ik_rotation_weight", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ikrotweight"); RNA_def_property_range(prop, 0.0f,1.0f); RNA_def_property_ui_text(prop, "IK Rot Weight", "Weight of rotation constraint for IK"); RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_update"); - prop= RNA_def_property(srna, "ik_lin_weight", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "ik_linear_weight", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "iklinweight"); RNA_def_property_range(prop, 0.0f,1.0f); RNA_def_property_ui_text(prop, "IK Lin Weight", "Weight of scale constraint for IK"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 86dae51b175..f09dd596f4f 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1596,13 +1596,13 @@ static void rna_def_scene_game_data(BlenderRNA *brna) RNA_def_property_update(prop, NC_SCENE, NULL); /* Framing */ - prop= RNA_def_property(srna, "framing_type", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "frame_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "framing.type"); RNA_def_property_enum_items(prop, framing_types_items); RNA_def_property_ui_text(prop, "Framing Types", "Select the type of Framing you want"); RNA_def_property_update(prop, NC_SCENE, NULL); - prop= RNA_def_property(srna, "framing_color", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "frame_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "framing.col"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Framing Color", "Set colour of the bars"); @@ -1621,7 +1621,7 @@ static void rna_def_scene_game_data(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Stereo Mode", "Stereographic techniques"); RNA_def_property_update(prop, NC_SCENE, NULL); - prop= RNA_def_property(srna, "eye_separation", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "stereo_eye_separation", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "eyeseparation"); RNA_def_property_range(prop, 0.01, 5.0); RNA_def_property_ui_text(prop, "Eye Separation", "Set the distance between the eyes - the camera focal length/30 should be fine"); @@ -1718,7 +1718,7 @@ static void rna_def_scene_game_data(BlenderRNA *brna) RNA_def_property_ui_text(prop, "DBVT culling", "Use optimized Bullet DBVT tree for view frustum and occlusion culling"); // not used // deprecated !!!!!!!!!!!!! - prop= RNA_def_property(srna, "activity_culling", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_activity_culling", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", (1 << 3)); //XXX mode hardcoded RNA_def_property_ui_text(prop, "Activity Culling", "Activity culling is enabled"); @@ -1757,7 +1757,7 @@ static void rna_def_scene_game_data(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", GAME_ENABLE_ANIMATION_RECORD); RNA_def_property_ui_text(prop, "Record Animation", "Record animation to fcurves"); - prop= RNA_def_property(srna, "auto_start", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_start", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_GameSettings_auto_start_get", "rna_GameSettings_auto_start_set"); RNA_def_property_ui_text(prop, "Auto Start", "Automatically start game at load time"); @@ -1768,32 +1768,32 @@ static void rna_def_scene_game_data(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Material Mode", "Material mode to use for rendering"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, NULL); - prop= RNA_def_property(srna, "glsl_lights", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_glsl_lights", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_LIGHTS); RNA_def_property_ui_text(prop, "GLSL Lights", "Use lights for GLSL rendering"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, "rna_Scene_glsl_update"); - prop= RNA_def_property(srna, "glsl_shaders", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_glsl_shaders", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_SHADERS); RNA_def_property_ui_text(prop, "GLSL Shaders", "Use shaders for GLSL rendering"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, "rna_Scene_glsl_update"); - prop= RNA_def_property(srna, "glsl_shadows", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_glsl_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_SHADOWS); RNA_def_property_ui_text(prop, "GLSL Shadows", "Use shadows for GLSL rendering"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, "rna_Scene_glsl_update"); - prop= RNA_def_property(srna, "glsl_ramps", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_glsl_ramps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_RAMPS); RNA_def_property_ui_text(prop, "GLSL Ramps", "Use ramps for GLSL rendering"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, "rna_Scene_glsl_update"); - prop= RNA_def_property(srna, "glsl_nodes", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_glsl_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_NODES); RNA_def_property_ui_text(prop, "GLSL Nodes", "Use nodes for GLSL rendering"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, "rna_Scene_glsl_update"); - prop= RNA_def_property(srna, "glsl_extra_textures", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_glsl_extra_textures", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GAME_GLSL_NO_EXTRA_TEX); RNA_def_property_ui_text(prop, "GLSL Extra Textures", "Use extra textures like normal or specular maps for GLSL rendering"); RNA_def_property_update(prop, NC_SCENE|NA_EDITED, "rna_Scene_glsl_update"); @@ -2114,7 +2114,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Codec", "Codec settings for OpenEXR"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); - prop= RNA_def_property(srna, "exr_half", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_exr_half", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "subimtype", R_OPENEXR_HALF); RNA_def_property_ui_text(prop, "Half", "Use 16 bit floats instead of 32 bit floats per channel"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index ca51708500d..866df006447 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -251,7 +251,7 @@ static void rna_def_vertex_paint(BlenderRNA *brna) RNA_def_struct_sdna(srna, "VPaint"); RNA_def_struct_ui_text(srna, "Vertex Paint", "Properties of vertex and weight paint mode"); - prop= RNA_def_property(srna, "all_faces", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_all_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_AREA); RNA_def_property_ui_text(prop, "All Faces", "Paint on all faces inside brush"); @@ -259,7 +259,7 @@ static void rna_def_vertex_paint(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_NORMALS); RNA_def_property_ui_text(prop, "Normals", "Applies the vertex normal before painting"); - prop= RNA_def_property(srna, "spray", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_spray", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", VP_SPRAY); RNA_def_property_ui_text(prop, "Spray", "Keep applying paint effect while holding mouse"); } @@ -366,21 +366,21 @@ static void rna_def_particle_edit(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, NULL, "rna_ParticleEdit_tool_set", "rna_ParticleEdit_tool_itemf"); RNA_def_property_ui_text(prop, "Tool", ""); - prop= RNA_def_property(srna, "selection_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "select_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "selectmode"); RNA_def_property_enum_items(prop, select_mode_items); RNA_def_property_ui_text(prop, "Selection Mode", "Particle select and display mode"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_update"); - prop= RNA_def_property(srna, "keep_lengths", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_preserve_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_KEEP_LENGTHS); RNA_def_property_ui_text(prop, "Keep Lengths", "Keep path lengths constant"); - prop= RNA_def_property(srna, "keep_root", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_preserve_root", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_LOCK_FIRST); RNA_def_property_ui_text(prop, "Keep Root", "Keep root keys unmodified"); - prop= RNA_def_property(srna, "emitter_deflect", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_emitter_deflect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_DEFLECT_EMITTER); RNA_def_property_ui_text(prop, "Deflect Emitter", "Keep paths from intersecting the emitter"); @@ -389,12 +389,12 @@ static void rna_def_particle_edit(BlenderRNA *brna) RNA_def_property_ui_range(prop, 0.0f, 10.0f, 10, 3); RNA_def_property_ui_text(prop, "Emitter Distance", "Distance to keep particles away from the emitter"); - prop= RNA_def_property(srna, "fade_time", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_fade_time", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_FADE_TIME); RNA_def_property_ui_text(prop, "Fade Time", "Fade paths and keys further away from current frame"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_update"); - prop= RNA_def_property(srna, "auto_velocity", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_velocity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_AUTO_VELOCITY); RNA_def_property_ui_text(prop, "Auto Velocity", "Calculate point velocities automatically"); @@ -403,11 +403,11 @@ static void rna_def_particle_edit(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Draw Particles", "Draw actual particles"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_redo"); - prop= RNA_def_property(srna, "add_interpolate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_default_interpolate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PE_INTERPOLATE_ADDED); RNA_def_property_ui_text(prop, "Interpolate", "Interpolate new particles from the existing ones"); - prop= RNA_def_property(srna, "add_keys", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "default_key_count", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "totaddkey"); RNA_def_property_range(prop, 2, INT_MAX); RNA_def_property_ui_range(prop, 2, 20, 10, 3); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index e31db89a182..89c7c5f37b0 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -764,17 +764,17 @@ static void rna_def_strip_color_balance(BlenderRNA *brna) RNA_def_property_ui_range(prop, 0, 2, 0.1, 3); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "inverse_gain", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_gain", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_COLOR_BALANCE_INVERSE_GAIN); RNA_def_property_ui_text(prop, "Inverse Gain", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "inverse_gamma", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_gamma", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_COLOR_BALANCE_INVERSE_GAMMA); RNA_def_property_ui_text(prop, "Inverse Gamma", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "inverse_lift", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_lift", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_COLOR_BALANCE_INVERSE_LIFT); RNA_def_property_ui_text(prop, "Inverse Lift", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); @@ -883,7 +883,7 @@ static void rna_def_sequence(BlenderRNA *brna) /* strip positioning */ - prop= RNA_def_property(srna, "frame_final_length", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_final_duration", PROP_INT, PROP_TIME); RNA_def_property_range(prop, 1, MAXFRAME); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Length", "The length of the contents of this strip before the handles are applied"); @@ -952,12 +952,13 @@ static void rna_def_sequence(BlenderRNA *brna) /* blending */ - prop= RNA_def_property(srna, "blend_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "blend_mode"); RNA_def_property_enum_items(prop, blend_mode_items); RNA_def_property_ui_text(prop, "Blend Mode", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "blend_opacity", PROP_FLOAT, PROP_FACTOR); + prop= RNA_def_property(srna, "blend_alpha", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Blend Opacity", ""); RNA_def_property_float_funcs(prop, "rna_Sequence_opacity_get", "rna_Sequence_opacity_set", NULL); // stupid 0-100 -> 0-1 @@ -969,7 +970,7 @@ static void rna_def_sequence(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Effect fader position", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "use_effect_default_fade", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_default_fade", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_USE_EFFECT_DEFAULT_FADE); RNA_def_property_ui_text(prop, "Use Default Fade", "Fade effect using the built-in default (usually make transition as long as effect strip)"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); @@ -1037,37 +1038,37 @@ static void rna_def_filter_video(StructRNA *srna) { PropertyRNA *prop; - prop= RNA_def_property(srna, "de_interlace", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_deinterlace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_FILTERY); RNA_def_property_ui_text(prop, "De-Interlace", "For video movies to remove fields"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update_reopen_files"); - prop= RNA_def_property(srna, "premultiply", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_MAKE_PREMUL); RNA_def_property_ui_text(prop, "Premultiply", "Convert RGB from key alpha to premultiplied alpha"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL); - prop= RNA_def_property(srna, "flip_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_flip_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_FLIPX); RNA_def_property_ui_text(prop, "Flip X", "Flip on the X axis"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "flip_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_flip_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_FLIPY); RNA_def_property_ui_text(prop, "Flip Y", "Flip on the Y axis"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "convert_float", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_float", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_MAKE_FLOAT); RNA_def_property_ui_text(prop, "Convert Float", "Convert input to float data"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "reverse_frames", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_reverse_frames", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_REVERSE_FRAMES); RNA_def_property_ui_text(prop, "Flip Time", "Reverse frame order"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "multiply_colors", PROP_FLOAT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "color_multiply", PROP_FLOAT, PROP_UNSIGNED); RNA_def_property_float_sdna(prop, NULL, "mul"); RNA_def_property_range(prop, 0.0f, 20.0f); RNA_def_property_ui_text(prop, "Multiply Colors", ""); @@ -1129,12 +1130,12 @@ static void rna_def_proxy(StructRNA *srna) RNA_def_property_pointer_sdna(prop, NULL, "strip->proxy"); RNA_def_property_ui_text(prop, "Proxy", ""); - prop= RNA_def_property(srna, "proxy_custom_directory", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_proxy_custom_directory", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_USE_PROXY_CUSTOM_DIR); RNA_def_property_ui_text(prop, "Proxy Custom Directory", "Use a custom directory to store data"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "proxy_custom_file", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_proxy_custom_file", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_USE_PROXY_CUSTOM_FILE); RNA_def_property_ui_text(prop, "Proxy Custom File", "Use a custom file to read proxy data from"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); @@ -1144,7 +1145,7 @@ static void rna_def_input(StructRNA *srna) { PropertyRNA *prop; - prop= RNA_def_property(srna, "animation_start_offset", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "animation_offset_start", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "anim_startofs"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_anim_startofs_final_set", NULL); // overlap tests @@ -1152,7 +1153,7 @@ static void rna_def_input(StructRNA *srna) RNA_def_property_ui_text(prop, "Animation Start Offset", "Animation start offset (trim start)"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "animation_end_offset", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "animation_offset_end", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "anim_endofs"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_anim_endofs_final_set", NULL); // overlap tests @@ -1417,7 +1418,7 @@ static void rna_def_glow(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Boost Factor", "Brightness multiplier"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "blur_distance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "blur_radius", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "dDist"); RNA_def_property_range(prop, 0.5f, 20.0f); RNA_def_property_ui_text(prop, "Blur Distance", "Radius of glow effect"); @@ -1429,7 +1430,7 @@ static void rna_def_glow(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Quality", "Accuracy of the blur effect"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "only_boost", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_only_boost", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bNoComp", 0); RNA_def_property_ui_text(prop, "Only Boost", "Show the glow buffer only"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); @@ -1469,7 +1470,7 @@ static void rna_def_transform(BlenderRNA *brna) RNA_def_property_ui_range(prop, 0, 10, 3, 10); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "uniform_scale", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_uniform_scale", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uniform_scale", 0); RNA_def_property_ui_text(prop, "Uniform Scale", "Scale uniformly, preserving aspect ratio"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); @@ -1537,17 +1538,17 @@ static void rna_def_speed_control(BlenderRNA *brna) RNA_def_property_ui_range(prop, 0.0f, 100.0f, 1, 0); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "curve_velocity", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_curve_velocity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_INTEGRATE); RNA_def_property_ui_text(prop, "F-Curve Velocity", "Interpret the F-Curve value as a velocity instead of a frame number"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "frame_blending", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_frame_blend", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_BLEND); RNA_def_property_ui_text(prop, "Frame Blending", "Blend two frames into the target for a smoother result"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "curve_compress_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_curve_compress_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SEQ_SPEED_COMPRESS_IPO_Y); RNA_def_property_ui_text(prop, "F-Curve Compress Y", "Scale F-Curve value to get the target frame number, F-Curve value runs from 0.0 to 1.0"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 4d727bd7008..80716e35d15 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -131,7 +131,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_struct_sdna(srna, "SmokeDomainSettings"); RNA_def_struct_path_func(srna, "rna_SmokeDomainSettings_path"); - prop= RNA_def_property(srna, "maxres", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "resolution_max", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "maxres"); RNA_def_property_range(prop, 24, 512); RNA_def_property_ui_range(prop, 24, 512, 2, 0); @@ -145,7 +145,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Amplification", "Enhance the resolution of smoke by this factor using noise"); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset"); - prop= RNA_def_property(srna, "highres", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_high_resolution", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGHRES); RNA_def_property_ui_text(prop, "High res", "Enable high resolution (using amplification)"); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset"); @@ -210,12 +210,12 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dissolve Speed", "Dissolve Speed"); RNA_def_property_update(prop, 0, NULL); - prop= RNA_def_property(srna, "dissolve_smoke", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_dissolve_smoke", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE); RNA_def_property_ui_text(prop, "Dissolve Smoke", "Enable smoke to disappear over time"); RNA_def_property_update(prop, 0, NULL); - prop= RNA_def_property(srna, "dissolve_smoke_log", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_dissolve_smoke_log", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_DISSOLVE_LOG); RNA_def_property_ui_text(prop, "Logarithmic dissolve", "Using 1/x "); RNA_def_property_update(prop, 0, NULL); @@ -230,19 +230,19 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "point_cache[1]"); RNA_def_property_ui_text(prop, "Point Cache", ""); - prop= RNA_def_property(srna, "smoke_cache_comp", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "point_cache_compress_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "cache_comp"); RNA_def_property_enum_items(prop, smoke_cache_comp_items); RNA_def_property_ui_text(prop, "Cache Compression", "Compression method to be used"); RNA_def_property_update(prop, 0, NULL); - prop= RNA_def_property(srna, "smoke_cache_high_comp", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "point_cache_compress_high_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "cache_high_comp"); RNA_def_property_enum_items(prop, smoke_cache_comp_items); RNA_def_property_ui_text(prop, "Cache Compression", "Compression method to be used"); RNA_def_property_update(prop, 0, NULL); - prop= RNA_def_property(srna, "smoke_domain_colli", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "collision_extents", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "border_collisions"); RNA_def_property_enum_items(prop, smoke_domain_colli_items); RNA_def_property_ui_text(prop, "Border Collisions", "Selects which domain border will be treated as collision object."); @@ -253,7 +253,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Effector Weights", ""); - prop= RNA_def_property(srna, "smoothemitter", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "smooth_emitter", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_SMOKE_HIGH_SMOOTH); RNA_def_property_ui_text(prop, "Smooth Emitter", "Smoothens emitted smoke to avoid blockiness."); RNA_def_property_update(prop, 0, NULL); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 732a5a1a9d5..731a7b62213 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -388,22 +388,22 @@ static void rna_def_texmapping(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Scale", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "minimum", PROP_FLOAT, PROP_XYZ); + prop= RNA_def_property(srna, "min", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "min"); RNA_def_property_ui_text(prop, "Minimum", "Minimum value for clipping"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "maximum", PROP_FLOAT, PROP_XYZ); + prop= RNA_def_property(srna, "max", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "max"); RNA_def_property_ui_text(prop, "Maximum", "Maximum value for clipping"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "has_minimum", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_min", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MIN); RNA_def_property_ui_text(prop, "Has Minimum", "Whether to use minimum clipping value"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "has_maximum", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_max", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEXMAP_CLIP_MAX); RNA_def_property_ui_text(prop, "Has Maximum", "Whether to use maximum clipping value"); RNA_def_property_update(prop, 0, "rna_Texture_update"); @@ -481,7 +481,7 @@ static void rna_def_mtex(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Blend Type", ""); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); - prop= RNA_def_property(srna, "stencil", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_stencil", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_STENCIL); RNA_def_property_ui_text(prop, "Stencil", "Use this texture as a blending value on the next texture"); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); @@ -491,7 +491,7 @@ static void rna_def_mtex(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Negate", "Inverts the values of the texture to reverse its effect"); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); - prop= RNA_def_property(srna, "rgb_to_intensity", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_rgb_to_intensity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_RGBTOINT); RNA_def_property_ui_text(prop, "RGB to Intensity", "Converts texture RGB values to intensity (gray) values"); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); @@ -520,7 +520,7 @@ static void rna_def_filter_common(StructRNA *srna) RNA_def_property_ui_text(prop, "MIP Map", "Uses auto-generated MIP maps for the image"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "mipmap_gauss", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mipmap_gauss", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_GAUSS_MIP); RNA_def_property_ui_text(prop, "MIP Map Gaussian filter", "Uses Gauss filter to sample down MIP maps"); RNA_def_property_update(prop, 0, "rna_Texture_update"); @@ -543,7 +543,7 @@ static void rna_def_filter_common(StructRNA *srna) RNA_def_property_ui_text(prop, "Filter Eccentricity", "Maximum eccentricity. Higher gives less blur at distant/oblique angles, but is also slower"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "filter_size_minimum", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_filter_size_min", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_FILTER_MIN); RNA_def_property_ui_text(prop, "Minimum Filter Size", "Use Filter Size as a minimal filter value in pixels"); RNA_def_property_update(prop, 0, "rna_Texture_update"); @@ -666,7 +666,7 @@ static void rna_def_texture_clouds(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Clouds Texture", "Procedural noise texture"); RNA_def_struct_sdna(srna, "Tex"); - prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noisesize"); RNA_def_property_range(prop, 0.0001, FLT_MAX); RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2); @@ -727,7 +727,7 @@ static void rna_def_texture_wood(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Wood Texture", "Procedural noise texture"); RNA_def_struct_sdna(srna, "Tex"); - prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noisesize"); RNA_def_property_range(prop, 0.0001, FLT_MAX); RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2); @@ -759,7 +759,7 @@ static void rna_def_texture_wood(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Pattern", ""); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "noisebasis2", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "noisebasis_2", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "noisebasis2"); RNA_def_property_enum_items(prop, prop_wood_noisebasis2); RNA_def_property_ui_text(prop, "Noise Basis 2", ""); @@ -794,7 +794,7 @@ static void rna_def_texture_marble(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Marble Texture", "Procedural noise texture"); RNA_def_struct_sdna(srna, "Tex"); - prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noisesize"); RNA_def_property_range(prop, 0.0001, FLT_MAX); RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2); @@ -833,7 +833,7 @@ static void rna_def_texture_marble(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence"); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "noisebasis2", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "noisebasis_2", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "noisebasis2"); RNA_def_property_enum_items(prop, prop_marble_noisebasis2); RNA_def_property_ui_text(prop, "Noise Basis 2", ""); @@ -901,7 +901,7 @@ static void rna_def_texture_blend(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Progression", "Sets the style of the color blending"); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "flip_axis", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "use_flip_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, prop_flip_axis_items); RNA_def_property_ui_text(prop, "Flip Axis", "Flips the texture's X and Y axis"); @@ -937,7 +937,7 @@ static void rna_def_texture_stucci(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noisesize"); RNA_def_property_range(prop, 0.0001, FLT_MAX); RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2); @@ -996,7 +996,7 @@ static void rna_def_texture_image(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Texture_update"); /* XXX: I think flip_axis should be a generic Texture property, enabled for all the texture types */ - prop= RNA_def_property(srna, "flip_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_flip_axis", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_IMAROT); RNA_def_property_ui_text(prop, "Flip Axis", "Flips the texture's X and Y axis"); RNA_def_property_update(prop, 0, "rna_Texture_update"); @@ -1006,7 +1006,7 @@ static void rna_def_texture_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Alpha", "Uses the alpha channel information in the image"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "calculate_alpha", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_calculate_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_CALCALPHA); RNA_def_property_ui_text(prop, "Calculate Alpha", "Calculates an alpha channel based on RGB values in the image"); RNA_def_property_update(prop, 0, "rna_Texture_update"); @@ -1036,22 +1036,22 @@ static void rna_def_texture_image(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Repeat Y", "Sets a repetition multiplier in the Y direction"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "mirror_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mirror_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_REPEAT_XMIR); RNA_def_property_ui_text(prop, "Mirror X", "Mirrors the image repetition on the X direction"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "mirror_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mirror_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_REPEAT_YMIR); RNA_def_property_ui_text(prop, "Mirror Y", "Mirrors the image repetition on the Y direction"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "checker_odd", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_checker_odd", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_CHECKER_ODD); RNA_def_property_ui_text(prop, "Checker Odd", "Sets odd checker tiles"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "checker_even", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_checker_even", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_CHECKER_EVEN); RNA_def_property_ui_text(prop, "Checker Even", "Sets even checker tiles"); RNA_def_property_update(prop, 0, "rna_Texture_update"); @@ -1118,7 +1118,7 @@ static void rna_def_texture_image(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Texture_update"); /* Normal Map */ - prop= RNA_def_property(srna, "normal_map", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_normal_map", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_NORMALMAP); RNA_def_property_ui_text(prop, "Normal Map", "Uses image RGB values for normal mapping"); RNA_def_property_update(prop, 0, "rna_Texture_update"); @@ -1197,7 +1197,7 @@ static void rna_def_texture_musgrave(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Type", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "highest_dimension", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "dimension_max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "mg_H"); RNA_def_property_range(prop, 0.0001, 2); RNA_def_property_ui_text(prop, "Highest Dimension", "Highest fractal dimension"); @@ -1233,7 +1233,7 @@ static void rna_def_texture_musgrave(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Intensity", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noisesize"); RNA_def_property_range(prop, 0.0001, FLT_MAX); RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2); @@ -1316,7 +1316,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Distance Metric", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "coloring", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "vn_coltype"); RNA_def_property_enum_items(prop, prop_coloring_items); RNA_def_property_ui_text(prop, "Coloring", ""); @@ -1328,7 +1328,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Intensity", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noisesize"); RNA_def_property_range(prop, 0.0001, FLT_MAX); RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2); @@ -1357,7 +1357,7 @@ static void rna_def_texture_distorted_noise(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Distortion Amount", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noisesize"); RNA_def_property_range(prop, 0.0001, FLT_MAX); RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2); @@ -1451,13 +1451,13 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "particle_cache", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "particle_cache_space", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "psys_cache_space"); RNA_def_property_enum_items(prop, particle_cache_items); RNA_def_property_ui_text(prop, "Particle Cache", "Co-ordinate system to cache particles in"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "vertices_cache", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "vertex_cache_space", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ob_cache_space"); RNA_def_property_enum_items(prop, vertice_cache_items); RNA_def_property_ui_text(prop, "Vertices Cache", "Co-ordinate system to cache vertices in"); @@ -1475,7 +1475,7 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Falloff", "Method of attenuating density by distance from the point"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "falloff_softness", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "falloff_soft", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "falloff_softness"); RNA_def_property_range(prop, 0.01, FLT_MAX); RNA_def_property_ui_text(prop, "Softness", "Softness of the 'soft' falloff option"); @@ -1500,12 +1500,12 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Texture_update"); /* Turbulence */ - prop= RNA_def_property(srna, "turbulence", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_turbulence", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_PD_TURBULENCE); RNA_def_property_ui_text(prop, "Turbulence", "Add directed noise to the density at render-time"); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "turbulence_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "turbulence_scale", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "noise_size"); RNA_def_property_range(prop, 0.01, FLT_MAX); RNA_def_property_ui_text(prop, "Size", "Scale of the added turbulent noise"); @@ -1614,7 +1614,7 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) RNA_def_property_ui_text(prop, "File Format", "Format of the source data set to render "); RNA_def_property_update(prop, 0, "rna_Texture_voxeldata_update"); - prop= RNA_def_property(srna, "source_path", PROP_STRING, PROP_FILEPATH); + prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); RNA_def_property_string_sdna(prop, NULL, "source_path"); RNA_def_property_ui_text(prop, "Source Path", "The external source data file to use"); RNA_def_property_update(prop, 0, "rna_Texture_voxeldata_update"); @@ -1629,7 +1629,7 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Still Frame Only", "Always render a still frame from the voxel data sequence"); RNA_def_property_update(prop, 0, "rna_Texture_voxeldata_update"); - prop= RNA_def_property(srna, "still_frame_number", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "still_frame", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "still_frame"); RNA_def_property_range(prop, -MAXFRAME, MAXFRAME); RNA_def_property_ui_text(prop, "Still Frame Number", "The frame number to always use"); diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index f4517c8a5ee..421044f68d6 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -119,22 +119,22 @@ static void rna_def_world_mtex(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "World Texture Slot", "Texture slot for textures in a World datablock"); /* map to */ - prop= RNA_def_property(srna, "map_blend", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_blend", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", WOMAP_BLEND); RNA_def_property_ui_text(prop, "Blend", "Affect the color progression of the background"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "map_horizon", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_horizon", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", WOMAP_HORIZ); RNA_def_property_ui_text(prop, "Horizon", "Affect the color of the horizon"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "map_zenith_up", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_zenith_up", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", WOMAP_ZENUP); RNA_def_property_ui_text(prop, "Zenith Up", "Affect the color of the zenith above"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "map_zenith_down", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_zenith_down", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mapto", WOMAP_ZENDOWN); RNA_def_property_ui_text(prop, "Zenith Down", "Affect the color of the zenith below"); RNA_def_property_update(prop, 0, "rna_World_update"); @@ -144,7 +144,7 @@ static void rna_def_world_mtex(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "mapto", WOMAP_MIST); RNA_def_property_ui_text(prop, "Mist", "Causes the texture to affect the intensity of the mist");*/ - prop= RNA_def_property(srna, "texture_coordinates", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texco"); RNA_def_property_enum_items(prop, texco_items); RNA_def_property_ui_text(prop, "Texture Coordinates", "Texture coordinates used to map the texture onto the background"); @@ -227,14 +227,14 @@ static void rna_def_lighting(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Factor", "Factor for ambient occlusion blending"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "ao_blend_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "ao_blend_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "aomix"); RNA_def_property_enum_items(prop, blend_mode_items); RNA_def_property_ui_text(prop, "Blend Mode", "Defines how AO mixes with material shading"); RNA_def_property_update(prop, 0, "rna_World_update"); /* environment lighting */ - prop= RNA_def_property(srna, "use_environment_lighting", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_environment_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", WO_ENV_LIGHT); RNA_def_property_ui_text(prop, "Use Environment Lighting", "Add light coming from the environment"); RNA_def_property_update(prop, 0, "rna_World_update"); @@ -252,7 +252,7 @@ static void rna_def_lighting(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_World_update"); /* indirect lighting */ - prop= RNA_def_property(srna, "use_indirect_lighting", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_indirect_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", WO_INDIRECT_LIGHT); RNA_def_property_ui_text(prop, "Use Indirect Lighting", "Add indirect light bouncing of surrounding objects"); RNA_def_property_update(prop, 0, "rna_World_update"); @@ -311,7 +311,7 @@ static void rna_def_lighting(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Adapt To Speed", "Use the speed vector pass to reduce AO samples in fast moving pixels. Higher values result in more aggressive sample reduction. Requires Vec pass enabled (for Raytrace Adaptive QMC)"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "error_tolerance", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "error_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ao_approx_error"); RNA_def_property_range(prop, 0.0001, 10); RNA_def_property_ui_text(prop, "Error Tolerance", "Low values are slower and higher quality (for Approximate)"); @@ -329,7 +329,7 @@ static void rna_def_lighting(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Falloff", ""); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "pixel_cache", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "aomode", WO_AOCACHE); RNA_def_property_ui_text(prop, "Pixel Cache", "Cache AO results in pixels and interpolate over neighbouring pixels for speedup (for Approximate)"); RNA_def_property_update(prop, 0, "rna_World_update"); @@ -422,7 +422,7 @@ static void rna_def_world_stars(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Size", "Average screen dimension of stars"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "min_distance", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "distance_min", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "starmindist"); RNA_def_property_range(prop, 0, 1000); RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance to the camera for stars"); @@ -434,7 +434,7 @@ static void rna_def_world_stars(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Average Separation", "Average distance between any two stars"); RNA_def_property_update(prop, 0, "rna_World_draw_update"); - prop= RNA_def_property(srna, "color_randomization", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "color_random", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "starcolnoise"); RNA_def_property_range(prop, 0, 1); RNA_def_property_ui_text(prop, "Color Randomization", "Randomize star colors"); @@ -509,17 +509,17 @@ void RNA_def_world(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_World_update"); /* sky type */ - prop= RNA_def_property(srna, "blend_sky", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_sky_blend", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "skytype", WO_SKYBLEND); RNA_def_property_ui_text(prop, "Blend Sky", "Render background with natural progression from horizon to zenith"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "paper_sky", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_sky_paper", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "skytype", WO_SKYPAPER); RNA_def_property_ui_text(prop, "Paper Sky", "Flatten blend or texture coordinates"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "real_sky", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_sky_real", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "skytype", WO_SKYREAL); RNA_def_property_ui_text(prop, "Real Sky", "Render background with a real horizon, relative to the camera angle"); RNA_def_property_update(prop, 0, "rna_World_update"); diff --git a/source/blender/makesrna/rna_cleanup/rna_properties.txt b/source/blender/makesrna/rna_cleanup/rna_properties.txt index 3b72ecc5468..2a4d0070189 100644 --- a/source/blender/makesrna/rna_cleanup/rna_properties.txt +++ b/source/blender/makesrna/rna_cleanup/rna_properties.txt @@ -2391,7 +2391,6 @@ #+ * Modifier|SmokeModifier.coll_settings -> coll_settings: pointer, "(read-only)" #+ * Modifier|SmokeModifier.domain_settings -> domain_settings: pointer, "(read-only)" #+ * Modifier|SmokeModifier.flow_settings -> flow_settings: pointer, "(read-only)" - + * Modifier|SmokeModifier.smoke_type -> type: enum "NO DESCRIPTION" #+ * Modifier|SmoothModifier.factor -> factor: float "NO DESCRIPTION" + * Modifier|SmoothModifier.repeat -> iterations: int "NO DESCRIPTION" + * Modifier|SmoothModifier.x -> use_x: boolean "NO DESCRIPTION" @@ -4594,7 +4593,7 @@ #+ * WorldLighting.sample_method -> sample_method: enum "Method for generating shadow samples (for Raytrace)" #+ * WorldLighting.samples -> samples: int "Amount of ray samples. Higher values give smoother results and longer rendering times" #+ * WorldLighting.threshold -> threshold: float "Samples below this threshold will be considered fully shadowed/unshadowed and skipped (for Raytrace Adaptive QMC)" - + * WorldLighting.use_ambient_occlusion -> use_ambient_occlusian: boolean "Use Ambient Occlusion to add shadowing based on distance between objects" + + * WorldLighting.use_ambient_occlusion -> use_ambient_occlusion: boolean "Use Ambient Occlusion to add shadowing based on distance between objects" + * WorldLighting.pixel_cache -> use_cache: boolean "Cache AO results in pixels and interpolate over neighbouring pixels for speedup (for Approximate)" + * WorldLighting.use_environment_lighting -> use_environment_light: boolean "Add light coming from the environment" + * WorldLighting.falloff -> use_falloff: boolean "NO DESCRIPTION" diff --git a/source/gameengine/Converter/BL_ArmatureChannel.cpp b/source/gameengine/Converter/BL_ArmatureChannel.cpp index 4f06628b1c6..f971a900962 100644 --- a/source/gameengine/Converter/BL_ArmatureChannel.cpp +++ b/source/gameengine/Converter/BL_ArmatureChannel.cpp @@ -112,11 +112,11 @@ PyAttributeDef BL_ArmatureChannel::AttributesPtr[] = { KX_PYATTRIBUTE_FLAG_NEGATIVE_RO("ik_dof_x",bPoseChannel,ikflag, BONE_IK_NO_XDOF), KX_PYATTRIBUTE_FLAG_NEGATIVE_RO("ik_dof_y",bPoseChannel,ikflag, BONE_IK_NO_YDOF), KX_PYATTRIBUTE_FLAG_NEGATIVE_RO("ik_dof_z",bPoseChannel,ikflag, BONE_IK_NO_ZDOF), - KX_PYATTRIBUTE_FLAG_RO("ik_limit_x",bPoseChannel,ikflag, BONE_IK_XLIMIT), - KX_PYATTRIBUTE_FLAG_RO("ik_limit_y",bPoseChannel,ikflag, BONE_IK_YLIMIT), - KX_PYATTRIBUTE_FLAG_RO("ik_limit_z",bPoseChannel,ikflag, BONE_IK_ZLIMIT), - KX_PYATTRIBUTE_FLAG_RO("ik_rot_control",bPoseChannel,ikflag, BONE_IK_ROTCTL), - KX_PYATTRIBUTE_FLAG_RO("ik_lin_control",bPoseChannel,ikflag, BONE_IK_LINCTL), + KX_PYATTRIBUTE_FLAG_RO("use_ik_limit_x",bPoseChannel,ikflag, BONE_IK_XLIMIT), + KX_PYATTRIBUTE_FLAG_RO("use_ik_limit_y",bPoseChannel,ikflag, BONE_IK_YLIMIT), + KX_PYATTRIBUTE_FLAG_RO("use_ik_limit_z",bPoseChannel,ikflag, BONE_IK_ZLIMIT), + KX_PYATTRIBUTE_FLAG_RO("use_ik_rotation_control",bPoseChannel,ikflag, BONE_IK_ROTCTL), + KX_PYATTRIBUTE_FLAG_RO("use_ik_linear_control",bPoseChannel,ikflag, BONE_IK_LINCTL), KX_PYATTRIBUTE_FLOAT_VECTOR_RW("location",-FLT_MAX,FLT_MAX,bPoseChannel,loc,3), KX_PYATTRIBUTE_FLOAT_VECTOR_RW("scale",-FLT_MAX,FLT_MAX,bPoseChannel,size,3), KX_PYATTRIBUTE_FLOAT_VECTOR_RW("rotation_quaternion",-1.0f,1.0f,bPoseChannel,quat,4), @@ -136,8 +136,8 @@ PyAttributeDef BL_ArmatureChannel::AttributesPtr[] = { KX_PYATTRIBUTE_FLOAT_RO("ik_stiffness_y",bPoseChannel,stiffness[1]), KX_PYATTRIBUTE_FLOAT_RO("ik_stiffness_z",bPoseChannel,stiffness[2]), KX_PYATTRIBUTE_FLOAT_RO("ik_stretch",bPoseChannel,ikstretch), - KX_PYATTRIBUTE_FLOAT_RW("ik_rot_weight",0,1.0f,bPoseChannel,ikrotweight), - KX_PYATTRIBUTE_FLOAT_RW("ik_lin_weight",0,1.0f,bPoseChannel,iklinweight), + KX_PYATTRIBUTE_FLOAT_RW("ik_rotation_weight",0,1.0f,bPoseChannel,ikrotweight), + KX_PYATTRIBUTE_FLOAT_RW("ik_linear_weight",0,1.0f,bPoseChannel,iklinweight), KX_PYATTRIBUTE_RW_FUNCTION("joint_rotation",BL_ArmatureChannel,py_attr_get_joint_rotation,py_attr_set_joint_rotation), { NULL } //Sentinel }; diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 9cdee2a340c..8f03408b841 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -557,7 +557,7 @@ int main(int argc, char** argv) #if 0 // future stuff - else if(!strcmp(argv[i], "stencil") + else if(!strcmp(argv[i], "use_stencil") stereomode = RAS_STEREO_STENCIL; #endif diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index d88997e2128..f697942c6ee 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -796,7 +796,7 @@ PyMethodDef KX_BlenderMaterial::Methods[] = PyAttributeDef KX_BlenderMaterial::Attributes[] = { KX_PYATTRIBUTE_RO_FUNCTION("shader", KX_BlenderMaterial, pyattr_get_shader), KX_PYATTRIBUTE_RO_FUNCTION("material_index", KX_BlenderMaterial, pyattr_get_materialIndex), - KX_PYATTRIBUTE_RW_FUNCTION("blending", KX_BlenderMaterial, pyattr_get_blending, pyattr_set_blending), + KX_PYATTRIBUTE_RW_FUNCTION("blend_type", KX_BlenderMaterial, pyattr_get_blending, pyattr_set_blending), { NULL } //Sentinel }; diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index d4936d7054c..d0d27700166 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -2133,7 +2133,7 @@ PyAttributeDef KX_Scene::Attributes[] = { KX_PYATTRIBUTE_RW_FUNCTION("pre_draw", KX_Scene, pyattr_get_drawing_callback_pre, pyattr_set_drawing_callback_pre), KX_PYATTRIBUTE_RW_FUNCTION("post_draw", KX_Scene, pyattr_get_drawing_callback_post, pyattr_set_drawing_callback_post), KX_PYATTRIBUTE_BOOL_RO("suspended", KX_Scene, m_suspend), - KX_PYATTRIBUTE_BOOL_RO("activity_culling", KX_Scene, m_activity_culling), + KX_PYATTRIBUTE_BOOL_RO("use_activity_culling", KX_Scene, m_activity_culling), KX_PYATTRIBUTE_FLOAT_RW("activity_culling_radius", 0.5f, FLT_MAX, KX_Scene, m_activity_box_radius), KX_PYATTRIBUTE_BOOL_RO("dbvt_culling", KX_Scene, m_dbvt_culling), { NULL } //Sentinel |