diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index ef1cdee5686..5ca0b0d60b4 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -525,7 +525,6 @@ int AUD_setDistanceModel(AUD_DistanceModel model) int AUD_setSourceLocation(AUD_Channel* handle, const float* location) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -539,7 +538,6 @@ int AUD_setSourceLocation(AUD_Channel* handle, const float* location) int AUD_setSourceVelocity(AUD_Channel* handle, const float* velocity) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -553,7 +551,6 @@ int AUD_setSourceVelocity(AUD_Channel* handle, const float* velocity) int AUD_setSourceOrientation(AUD_Channel* handle, const float* orientation) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -567,7 +564,6 @@ int AUD_setSourceOrientation(AUD_Channel* handle, const float* orientation) int AUD_setRelative(AUD_Channel* handle, int relative) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -580,7 +576,6 @@ int AUD_setRelative(AUD_Channel* handle, int relative) int AUD_setVolumeMaximum(AUD_Channel* handle, float volume) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -593,7 +588,6 @@ int AUD_setVolumeMaximum(AUD_Channel* handle, float volume) int AUD_setVolumeMinimum(AUD_Channel* handle, float volume) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -606,7 +600,6 @@ int AUD_setVolumeMinimum(AUD_Channel* handle, float volume) int AUD_setDistanceMaximum(AUD_Channel* handle, float distance) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -619,7 +612,6 @@ int AUD_setDistanceMaximum(AUD_Channel* handle, float distance) int AUD_setDistanceReference(AUD_Channel* handle, float distance) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -632,7 +624,6 @@ int AUD_setDistanceReference(AUD_Channel* handle, float distance) int AUD_setAttenuation(AUD_Channel* handle, float factor) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -645,7 +636,6 @@ int AUD_setAttenuation(AUD_Channel* handle, float factor) int AUD_setConeAngleOuter(AUD_Channel* handle, float angle) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -658,7 +648,6 @@ int AUD_setConeAngleOuter(AUD_Channel* handle, float angle) int AUD_setConeAngleInner(AUD_Channel* handle, float angle) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { @@ -671,7 +660,6 @@ int AUD_setConeAngleInner(AUD_Channel* handle, float angle) int AUD_setConeVolumeOuter(AUD_Channel* handle, float volume) { assert(AUD_device); - assert(handle); if(AUD_3ddevice) { diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp index 6d43bc95471..917c510348a 100644 --- a/intern/smoke/intern/WTURBULENCE.cpp +++ b/intern/smoke/intern/WTURBULENCE.cpp @@ -825,13 +825,18 @@ void WTURBULENCE::stepTurbulenceFull(float dtOrg, float* xvel, float* yvel, floa // get LU factorization of texture jacobian and apply // it to unit vectors sLU LU = computeLU(jacobian); - float xUnwarped[] = {1.0f, 0.0f, 0.0f}; - float yUnwarped[] = {0.0f, 1.0f, 0.0f}; - float zUnwarped[] = {0.0f, 0.0f, 1.0f}; - float xWarped[] = {1.0f, 0.0f, 0.0f}; - float yWarped[] = {0.0f, 1.0f, 0.0f}; - float zWarped[] = {0.0f, 0.0f, 1.0f}; + float xUnwarped[3], yUnwarped[3], zUnwarped[3]; + float xWarped[3], yWarped[3], zWarped[3]; bool nonSingular = isNonsingular(LU); + + xUnwarped[0] = 1.0f; xUnwarped[1] = 0.0f; xUnwarped[2] = 0.0f; + yUnwarped[0] = 0.0f; yUnwarped[1] = 1.0f; yUnwarped[2] = 0.0f; + zUnwarped[0] = 0.0f; zUnwarped[1] = 0.0f; zUnwarped[2] = 1.0f; + + xWarped[0] = 1.0f; xWarped[1] = 0.0f; xWarped[2] = 0.0f; + yWarped[0] = 0.0f; yWarped[1] = 1.0f; yWarped[2] = 0.0f; + zWarped[0] = 0.0f; zWarped[1] = 0.0f; zWarped[2] = 1.0f; + #if 0 // UNUSED float eigMax = 10.0f; 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 b0c9c94a3b0..aafb7c922a1 100644 --- a/release/scripts/io/export_x3d.py +++ b/release/scripts/io/export_x3d.py @@ -406,13 +406,13 @@ class x3d_class: # if mesh.faceUV: for face in mesh.active_uv_texture.data: # for face in mesh.faces: - if face.halo and 'HALO' not in mode: + if face.use_halo and 'HALO' not in mode: mode += ['HALO'] - if face.billboard and 'BILLBOARD' not in mode: + if face.use_billboard and 'BILLBOARD' not in mode: mode += ['BILLBOARD'] - if face.object_color and 'OBJECT_COLOR' not in mode: + if face.use_object_color and 'OBJECT_COLOR' not in mode: mode += ['OBJECT_COLOR'] - if face.collision and 'COLLISION' not in mode: + if face.use_collision and 'COLLISION' not in mode: mode += ['COLLISION'] # mode |= face.mode @@ -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() @@ -964,13 +964,8 @@ class x3d_class: if mesh.active_uv_texture: # if mesh.faceUV: for face in mesh.active_uv_texture.data: - # for face in mesh.faces: - sidename=''; - if face.twoside: - # if face.mode & Mesh.FaceModes.TWOSIDE: - sidename='two' - else: - sidename='one' + # for face in mesh.faces + sidename = "two" if face.use_twoside else "one" if sidename in sided: sided[sidename]+=1 @@ -1003,8 +998,8 @@ class x3d_class: if face.mode & Mesh.FaceModes.TWOSIDE: print("Debug: face.mode twosided") - print("Debug: face.transp=0x%x (enum)" % face.transp) - if face.transp == Mesh.FaceTranspModes.SOLID: + print("Debug: face.transp=0x%x (enum)" % face.blend_type) + if face.blend_type == Mesh.FaceTranspModes.SOLID: print("Debug: face.transp.SOLID") if face.image: diff --git a/release/scripts/io/import_scene_3ds.py b/release/scripts/io/import_scene_3ds.py index 266f7001cc2..6378d93df62 100644 --- a/release/scripts/io/import_scene_3ds.py +++ b/release/scripts/io/import_scene_3ds.py @@ -364,7 +364,7 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): bmesh.faces[fidx].material_index = mat_idx uf = uv_faces[fidx] uf.image = img - uf.tex = True + uf.use_image = True else: for fidx in faces: bmesh.faces[fidx].material_index = mat_idx diff --git a/release/scripts/io/import_scene_obj.py b/release/scripts/io/import_scene_obj.py index 63c62f4f781..655f797750e 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') @@ -745,9 +745,9 @@ def create_mesh(new_objects, has_ngons, CREATE_FGONS, CREATE_EDGES, verts_loc, v image, has_data = unique_material_images[context_material] if image: # Can be none if the material dosnt have an image. blender_tface.image = image - blender_tface.tex = True + blender_tface.use_image = True if has_data and image.depth == 32: - blender_tface.transp = 'ALPHA' + blender_tface.blend_type = 'ALPHA' # BUG - Evil eekadoodle problem where faces that have vert index 0 location at 3 or 4 are shuffled. if len(face_vert_loc_indicies)==4: @@ -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 a1ad4d3e91c..6f0f6460ae1 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -41,7 +41,7 @@ def addFluidFiles(job, path): job.addFile(path + fluid_file, current_frame, current_frame) def addPointCache(job, ob, point_cache, default_path): - if not point_cache.disk_cache: + if not point_cache.use_disk_cache: return @@ -49,7 +49,7 @@ def addPointCache(job, ob, point_cache, default_path): if name == "": name = "".join(["%02X" % ord(c) for c in ob.name]) - cache_path = bpy.path.abspath(point_cache.filepath) if point_cache.external else default_path + cache_path = bpy.path.abspath(point_cache.filepath) if point_cache.use_external else default_path index = "%02i" % point_cache.index @@ -146,9 +146,9 @@ 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.external: + elif modifier.type == "MULTIRES" and modifier.is_external: file_path = bpy.path.abspath(modifier.filepath) job.addFile(file_path) @@ -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/operators.py b/release/scripts/io/netrender/operators.py index c9645d0d1ee..252b1146b67 100644 --- a/release/scripts/io/netrender/operators.py +++ b/release/scripts/io/netrender/operators.py @@ -52,27 +52,27 @@ class RENDER_OT_netslave_bake(bpy.types.Operator): modifier.settings.path = relative_path bpy.ops.fluid.bake({"active_object": object, "scene": scene}) elif modifier.type == "CLOTH": - modifier.point_cache.step = 1 - modifier.point_cache.disk_cache = True - modifier.point_cache.external = False + modifier.point_cache.frame_step = 1 + modifier.point_cache.use_disk_cache = True + modifier.point_cache.use_external = False elif modifier.type == "SOFT_BODY": - modifier.point_cache.step = 1 - modifier.point_cache.disk_cache = True - modifier.point_cache.external = False + modifier.point_cache.frame_step = 1 + modifier.point_cache.use_disk_cache = True + modifier.point_cache.use_external = False elif modifier.type == "SMOKE" and modifier.smoke_type == "TYPE_DOMAIN": - modifier.domain_settings.point_cache_low.step = 1 - modifier.domain_settings.point_cache_low.disk_cache = True - modifier.domain_settings.point_cache_low.external = False - modifier.domain_settings.point_cache_high.step = 1 - modifier.domain_settings.point_cache_high.disk_cache = True - modifier.domain_settings.point_cache_high.external = False + modifier.domain_settings.point_cache_low.use_step = 1 + modifier.domain_settings.point_cache_low.use_disk_cache = True + modifier.domain_settings.point_cache_low.use_external = False + modifier.domain_settings.point_cache_high.use_step = 1 + modifier.domain_settings.point_cache_high.use_disk_cache = True + modifier.domain_settings.point_cache_high.use_external = False # particles modifier are stupid and don't contain data # we have to go through the object property for psys in object.particle_systems: - psys.point_cache.step = 1 - psys.point_cache.disk_cache = True - psys.point_cache.external = False + psys.point_cache.use_step = 1 + psys.point_cache.use_disk_cache = True + psys.point_cache.use_external = False psys.point_cache.filepath = relative_path bpy.ops.ptcache.bake_all() diff --git a/release/scripts/io/netrender/repath.py b/release/scripts/io/netrender/repath.py index 9243505bd3b..3ac9636b628 100644 --- a/release/scripts/io/netrender/repath.py +++ b/release/scripts/io/netrender/repath.py @@ -66,10 +66,10 @@ def update(job): def process(paths): def processPointCache(point_cache): - point_cache.external = False + point_cache.use_external = False def processFluid(fluid): - new_path = path_map.get(fluid.path, None) + new_path = path_map.get(fluid.filepath, None) if new_path: fluid.path = new_path @@ -121,9 +121,9 @@ 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.external: + elif modifier.type == "MULTIRES" and modifier.is_external: file_path = bpy.path.abspath(modifier.filepath) new_path = path_map.get(file_path, None) if new_path: 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 new file mode 100644 index 00000000000..8cc91873b0e --- /dev/null +++ b/release/scripts/modules/animsys_refactor.py @@ -0,0 +1,201 @@ +# ##### 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 ##### + +# + +""" +This module has utility functions for renaming +rna values in fcurves and drivers. + +The main function to use is: update_data_paths(...) +""" + +IS_TESTING = False + +class DataPathBuilder(object): + __slots__ = ("data_path", ) + """ Dummy class used to parse fcurve and driver data paths. + """ + def __init__(self, attrs): + self.data_path = attrs + + def __getattr__(self, attr): + str_value = ".%s" % attr + return DataPathBuilder(self.data_path + (str_value, )) + + def __getitem__(self, key): + str_value = '["%s"]' % key + return DataPathBuilder(self.data_path + (str_value, )) + + def resolve(self, real_base, rna_update_from_map=None): + """ Return (attribute, value) pairs. + """ + pairs = [] + base = real_base + 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: + 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 + +import bpy + + +def id_iter(): + type_iter = type(bpy.data.objects) + + for attr in dir(bpy.data): + data_iter = getattr(bpy.data, attr, None) + if type(data_iter) == type_iter: + for id_data in data_iter: + if id_data.library is None: + yield id_data + + +def anim_data_actions(anim_data): + actions = [] + actions.append(anim_data.action) + for track in anim_data.nla_tracks: + for strip in track.strips: + actions.append(strip.action) + + # filter out None + return [act for act in actions if act] + + +def classes_recursive(base_type, clss=None): + if clss is None: + clss = [base_type] + else: + clss.append(base_type) + + for base_type_iter in base_type.__bases__: + if base_type_iter is not object: + classes_recursive(base_type_iter, clss) + + return clss + + +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, rna_update_from_map) + + path_new = [pair[0] for pair in data_resolve] + + # print(data_resolve) + data_base = id_data + + for i, (attr, data) in enumerate(data_resolve): + if data is Ellipsis: + break + + if attr.startswith("."): + # try all classes + for data_base_type in classes_recursive(type(data_base)): + attr_new = rna_update_dict.get(data_base_type.__name__, {}).get(attr[1:]) + if attr_new: + path_new[i] = "." + attr_new + + # set this as the base for further properties + data_base = data + + data_path_new = "".join(path_new)[1:] # skip the first "." + return data_path_new + + +def update_data_paths(rna_update): + ''' rna_update triple [(class_name, from, to), ...] + ''' + + # make a faster lookup dict + 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) + if anim_data is None: + continue + + for fcurve in anim_data.drivers: + for var in fcurve.driver.variables: + if var.type == 'SINGLE_PROP': + for tar in var.targets: + id_data_other = tar.id + 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, rna_update_from_map) + # print(data_path_new) + if data_path_new != data_path: + if not IS_TESTING: + tar.data_path = data_path_new + print("driver (%s): %s -> %s" % (id_data_other.name, data_path, data_path_new)) + + + + 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, 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', '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 cbd7b522807..ac878c3c076 100644 --- a/release/scripts/modules/rigify/arm_biped.py +++ b/release/scripts/modules/rigify/arm_biped.py @@ -147,9 +147,9 @@ def ik(obj, definitions, base_names, options): ik_chain.update() # Set IK dof - ik_chain.forearm_p.ik_dof_x = True - ik_chain.forearm_p.ik_dof_y = False - ik_chain.forearm_p.ik_dof_z = False + ik_chain.forearm_p.lock_ik_x = False + ik_chain.forearm_p.lock_ik_y = True + ik_chain.forearm_p.lock_ik_z = True con = ik_chain.forearm_p.constraints.new('IK') con.target = obj @@ -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 767bf38b157..d2ddba9f549 100644 --- a/release/scripts/modules/rigify/leg_biped.py +++ b/release/scripts/modules/rigify/leg_biped.py @@ -211,9 +211,9 @@ def ik(obj, bone_definition, base_names, options): ik_chain.update() # Set IK dof - ik_chain.shin_p.ik_dof_x = True - ik_chain.shin_p.ik_dof_y = False - ik_chain.shin_p.ik_dof_z = False + ik_chain.shin_p.lock_ik_x = False + ik_chain.shin_p.lock_ik_y = True + ik_chain.shin_p.lock_ik_z = True # Set rotation modes and axis locks ik.foot_roll_p.rotation_mode = 'XYZ' @@ -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/modules/rna_info.py b/release/scripts/modules/rna_info.py index 98cd4bcbd3a..0a93121c559 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -595,7 +595,7 @@ def BuildRNAInfo(): op_mods = dir(bpy.ops) for op_mod_name in sorted(op_mods): - if op_mod_name.startswith('__') or op_mod_name in ("add", "remove"): + if op_mod_name.startswith('__'): continue op_mod = getattr(bpy.ops, op_mod_name) @@ -647,6 +647,7 @@ if __name__ == "__main__": if bpy.app.background: import sys sys.stderr.write("\n".join(data)) + sys.stderr.write("\n\nEOF\n") else: text = bpy.data.texts.new(name="api.py") text.from_string(data) diff --git a/release/scripts/op/animsys_update.py b/release/scripts/op/animsys_update.py new file mode 100644 index 00000000000..e3507dfae4a --- /dev/null +++ b/release/scripts/op/animsys_update.py @@ -0,0 +1,716 @@ +# ##### 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 ##### + +# + +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"), + ("WorldLighting", "falloff", "use_falloff"), + ("Constraint", "disabled", "is_valid"), + ("ClampToConstraint", "cyclic", "use_cyclic"), + ("ImageTexture", "filter", "filter_type"), + ("ImageTexture", "interpolation", "use_interpolation"), + ("ImageTexture", "mipmap", "use_mipmap"), + ("ImageUser", "frames", "frame_duration"), + ("ImageUser", "offset", "frame_offset"), + ("ImageUser", "cyclic", "use_cyclic"), + ("ArmatureModifier", "invert", "invert_vertex_group"), + ("ArmatureModifier", "quaternion", "use_deform_preserve_volume"), + ("ArrayModifier", "length", "fit_length"), + ("BevelModifier", "angle", "angle_limit"), + ("BuildModifier", "length", "frame_duration"), + ("BuildModifier", "randomize", "use_random_order"), + ("CastModifier", "x", "use_x"), + ("CastModifier", "y", "use_y"), + ("CastModifier", "z", "use_z"), + ("ExplodeModifier", "size", "use_size"), + ("MaskModifier", "invert", "invert_vertex_group"), + ("MeshDeformModifier", "invert", "invert_vertex_group"), + ("MeshDeformModifier", "dynamic", "use_dynamic_bind"), + ("MirrorModifier", "clip", "use_clip"), + ("MirrorModifier", "x", "use_x"), + ("MirrorModifier", "y", "use_y"), + ("MirrorModifier", "z", "use_z"), + ("ParticleInstanceModifier", "children", "use_children"), + ("ParticleInstanceModifier", "normal", "use_normal"), + ("ParticleInstanceModifier", "size", "use_size"), + ("ShrinkwrapModifier", "negative", "use_negative_direction"), + ("ShrinkwrapModifier", "positive", "use_positive_direction"), + ("ShrinkwrapModifier", "x", "use_project_x"), + ("ShrinkwrapModifier", "y", "use_project_y"), + ("ShrinkwrapModifier", "z", "use_project_z"), + ("ShrinkwrapModifier", "mode", "wrap_method"), + ("SimpleDeformModifier", "mode", "deform_method"), + ("SimpleDeformModifier", "relative", "use_relative"), + ("SmoothModifier", "repeat", "iterations"), + ("SmoothModifier", "x", "use_x"), + ("SmoothModifier", "y", "use_y"), + ("SmoothModifier", "z", "use_z"), + ("SolidifyModifier", "invert", "invert_vertex_group"), + ("WaveModifier", "cyclic", "use_cyclic"), + ("WaveModifier", "normals", "use_normal"), + ("WaveModifier", "x", "use_x"), + ("WaveModifier", "y", "use_y"), + ("DampedTrackConstraint", "track", "track_axis"), + ("FloorConstraint", "sticky", "use_sticky"), + ("FollowPathConstraint", "forward", "forward_axis"), + ("FollowPathConstraint", "up", "up_axis"), + ("LockedTrackConstraint", "lock", "lock_axis"), + ("LockedTrackConstraint", "track", "track_axis"), + ("MaintainVolumeConstraint", "axis", "free_axis"), + ("TrackToConstraint", "track", "track_axis"), + ("TrackToConstraint", "up", "up_axis"), + ("GameProperty", "debug", "show_debug"), + ("Image", "tiles", "use_tiles"), + ("Lamp", "diffuse", "use_diffuse"), + ("Lamp", "negative", "use_negative"), + ("Lamp", "layer", "use_own_layer"), + ("Lamp", "specular", "use_specular"), + ("AreaLamp", "dither", "use_dither"), + ("AreaLamp", "jitter", "use_jitter"), + ("SpotLamp", "square", "use_square"), + ("Material", "cubic", "use_cubic"), + ("Material", "shadows", "use_shadows"), + ("ParticleSettings", "amount", "count"), + ("ParticleSettings", "display", "draw_percentage"), + ("ParticleSettings", "velocity", "show_velocity"), + ("ParticleSettings", "trand", "use_emit_random"), + ("ParticleSettings", "parent", "use_parent_particles"), + ("ParticleSettings", "emitter", "use_render_emitter"), + ("ParticleSettings", "viewport", "use_simplify_viewport"), + ("Texture", "brightness", "intensity"), + ("CloudsTexture", "stype", "cloud_type"), + ("EnvironmentMapTexture", "filter", "filter_type"), + ("EnvironmentMapTexture", "mipmap", "use_mipmap"), + ("MarbleTexture", "stype", "marble_type"), + ("StucciTexture", "stype", "stucci_type"), + ("WoodTexture", "stype", "wood_type"), + ("World", "range", "color_range"), + ("World", "lighting", "light_settings"), + ("World", "mist", "mist_settings"), + ("World", "stars", "star_settings"), + ("MaterialHalo", "lines", "use_lines"), + ("MaterialHalo", "ring", "use_ring"), + ("MaterialHalo", "soft", "use_soft"), + ("MaterialHalo", "star", "use_star"), + ("MaterialHalo", "texture", "use_texture"), + ("MaterialPhysics", "damp", "damping"), + ("MaterialRaytraceTransparency", "limit", "depth_max"), + ("NlaStrip", "reversed", "use_reverse"), + ("CompositorNodeBlur", "bokeh", "use_bokeh"), + ("CompositorNodeBlur", "gamma", "use_gamma_correction"), + ("CompositorNodeBlur", "relative", "use_relative"), + ("CompositorNodeChannelMatte", "high", "limit_max"), + ("CompositorNodeChannelMatte", "low", "limit_min"), + ("CompositorNodeChannelMatte", "channel", "matte_channel"), + ("CompositorNodeChromaMatte", "cutoff", "threshold"), + ("CompositorNodeColorMatte", "h", "color_hue"), + ("CompositorNodeColorMatte", "s", "color_saturation"), + ("CompositorNodeColorMatte", "v", "color_value"), + ("CompositorNodeDBlur", "wrap", "use_wrap"), + ("CompositorNodeDefocus", "preview", "use_preview"), + ("CompositorNodeHueSat", "hue", "color_hue"), + ("CompositorNodeHueSat", "sat", "color_saturation"), + ("CompositorNodeHueSat", "val", "color_value"), + ("CompositorNodeImage", "frames", "frame_duration"), + ("CompositorNodeImage", "offset", "frame_offset"), + ("CompositorNodeImage", "start", "frame_start"), + ("CompositorNodeImage", "cyclic", "use_cyclic"), + ("CompositorNodeInvert", "alpha", "invert_alpha"), + ("CompositorNodeInvert", "rgb", "invert_rgb"), + ("CompositorNodeLensdist", "fit", "use_fit"), + ("CompositorNodeLensdist", "jitter", "use_jitter"), + ("CompositorNodeMixRGB", "alpha", "use_alpha"), + ("CompositorNodeRotate", "filter", "filter_type"), + ("CompositorNodeTime", "end", "frame_end"), + ("CompositorNodeTime", "start", "frame_start"), + ("CompositorNodeVecBlur", "curved", "use_curved"), + ("ShaderNodeExtendedMaterial", "diffuse", "use_diffuse"), + ("ShaderNodeExtendedMaterial", "specular", "use_specular"), + ("ShaderNodeMaterial", "diffuse", "use_diffuse"), + ("ShaderNodeMaterial", "specular", "use_specular"), + ("ShaderNodeMixRGB", "alpha", "use_alpha"), + ("TextureNodeCurveTime", "end", "frame_end"), + ("TextureNodeCurveTime", "start", "frame_start"), + ("TextureNodeMixRGB", "alpha", "use_alpha"), + ("TextureSlot", "negate", "invert"), + ("TextureSlot", "size", "scale"), + ("VertexPaint", "normals", "use_normal"), + ("SoftBodySettings", "damp", "damping"), + ("SequenceCrop", "right", "max_x"), + ("SequenceCrop", "top", "max_y"), + ("SequenceCrop", "bottom", "min_x"), + ("SequenceCrop", "left", "min_y"), + ] + + +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 6f9a96ec27b..663d576a9c0 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -224,56 +224,56 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): row.prop(ob.pose, "ik_solver") split = layout.split(percentage=0.25) - split.prop(pchan, "ik_dof_x", text="X") + split.prop(pchan, "lock_ik_x", text="Lock X") split.active = pchan.is_in_ik_chain row = split.row() row.prop(pchan, "ik_stiffness_x", text="Stiffness", slider=True) - row.active = pchan.ik_dof_x and pchan.is_in_ik_chain + row.active = pchan.lock_ik_x == False and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() - sub.prop(pchan, "ik_limit_x", text="Limit") - sub.active = pchan.ik_dof_x and pchan.is_in_ik_chain + 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.ik_dof_x 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, "ik_dof_y", text="Y") + split.prop(pchan, "lock_ik_y", text="Y") split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain row = split.row() row.prop(pchan, "ik_stiffness_y", text="Stiffness", slider=True) - row.active = pchan.ik_dof_y and pchan.is_in_ik_chain + row.active = pchan.lock_ik_y == False and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() - sub.prop(pchan, "ik_limit_y", text="Limit") - sub.active = pchan.ik_dof_y and pchan.is_in_ik_chain + 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.ik_dof_y 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, "ik_dof_z", text="Z") + split.prop(pchan, "lock_ik_z", text="Z") split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain sub = split.row() sub.prop(pchan, "ik_stiffness_z", text="Stiffness", slider=True) - sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain + sub.active = pchan.lock_ik_z == False and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() - sub.prop(pchan, "ik_limit_z", text="Limit") - sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain + 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.ik_dof_z 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 b3a9f025f54..3008db11b36 100644 --- a/release/scripts/ui/properties_data_curve.py +++ b/release/scripts/ui/properties_data_curve.py @@ -98,7 +98,7 @@ class DATA_PT_shape_curve(CurveButtonsPanel, bpy.types.Panel): col.prop(curve, "twist_smooth", text="Smooth") if is_text: col.label(text="Display:") - col.prop(curve, "fast", text="Fast Editing") + col.prop(curve, "use_fast_edit", text="Fast Editing") col = split.column() @@ -111,13 +111,13 @@ class DATA_PT_shape_curve(CurveButtonsPanel, bpy.types.Panel): if is_curve or is_text: sub = col.column() sub.label(text="Caps:") - sub.prop(curve, "front") - sub.prop(curve, "back") - sub.prop(curve, "use_deform_fill") + sub.prop(curve, "use_fill_front") + sub.prop(curve, "use_fill_back") + sub.prop(curve, "use_fill_deform") col.label(text="Textures:") - col.prop(curve, "map_along_length") - col.prop(curve, "auto_texspace") + col.prop(curve, "use_map_on_length") + col.prop(curve, "use_auto_texspace") class DATA_PT_geometry_curve(CurveButtonsPanel, bpy.types.Panel): @@ -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="") @@ -169,7 +169,7 @@ class DATA_PT_pathanim(CurveButtonsPanelCurve, bpy.types.Panel): layout.active = curve.use_path col = layout.column() - layout.prop(curve, "path_length", text="Frames") + layout.prop(curve, "path_duration", text="Frames") layout.prop(curve, "eval_time") split = layout.split() @@ -205,7 +205,7 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, bpy.types.Panel): col.label(text="Cyclic:") col.prop(act_spline, "use_smooth") col = split.column() - col.prop(act_spline, "cyclic_u", text="U") + col.prop(act_spline, "use_cyclic_u", text="U") else: col = split.column() @@ -218,13 +218,13 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, bpy.types.Panel): col.label(text="Resolution:") col = split.column() - col.prop(act_spline, "cyclic_u", text="U") + col.prop(act_spline, "use_cyclic_u", text="U") if act_spline.type == 'NURBS': sub = col.column() - # sub.active = (not act_spline.cyclic_u) - sub.prop(act_spline, "bezier_u", text="U") - sub.prop(act_spline, "endpoint_u", text="U") + # sub.active = (not act_spline.use_cyclic_u) + sub.prop(act_spline, "use_bezier_u", text="U") + sub.prop(act_spline, "use_endpoint_u", text="U") sub = col.column() sub.prop(act_spline, "order_u", text="U") @@ -232,13 +232,13 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, bpy.types.Panel): if is_surf: col = split.column() - col.prop(act_spline, "cyclic_v", text="V") + col.prop(act_spline, "use_cyclic_v", text="V") # its a surface, assume its a nurb. sub = col.column() - sub.active = (not act_spline.cyclic_v) - sub.prop(act_spline, "bezier_v", text="V") - sub.prop(act_spline, "endpoint_v", text="V") + sub.active = (not act_spline.use_cyclic_v) + sub.prop(act_spline, "use_bezier_v", text="V") + sub.prop(act_spline, "use_endpoint_v", text="V") sub = col.column() sub.prop(act_spline, "order_v", text="V") sub.prop(act_spline, "resolution_v", text="V") @@ -275,7 +275,7 @@ class DATA_PT_font(CurveButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(text, "text_size", text="Size") + col.prop(text, "size", text="Size") col = split.column() col.prop(text, "shear") @@ -294,14 +294,14 @@ class DATA_PT_font(CurveButtonsPanel, bpy.types.Panel): col = split.column() colsub = col.column(align=True) colsub.label(text="Underline:") - colsub.prop(text, "ul_position", text="Position") - colsub.prop(text, "ul_height", text="Thickness") + colsub.prop(text, "underline_position", text="Position") + colsub.prop(text, "underline_height", text="Thickness") 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() @@ -324,15 +324,15 @@ class DATA_PT_paragraph(CurveButtonsPanel, bpy.types.Panel): text = context.curve layout.label(text="Align:") - layout.prop(text, "spacemode", expand=True) + layout.prop(text, "align", expand=True) split = layout.split() col = split.column(align=True) col.label(text="Spacing:") - col.prop(text, "spacing", text="Character") - col.prop(text, "word_spacing", text="Word") - col.prop(text, "line_dist", text="Line") + col.prop(text, "space_character", text="Character") + col.prop(text, "space_word", text="Word") + col.prop(text, "space_line", text="Line") col = split.column(align=True) col.label(text="Offset:") diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/ui/properties_data_lamp.py index 5eca7c09198..ce0d404434d 100644 --- a/release/scripts/ui/properties_data_lamp.py +++ b/release/scripts/ui/properties_data_lamp.py @@ -99,17 +99,17 @@ 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") col.prop(lamp, "gamma") col = split.column() - col.prop(lamp, "negative") - col.prop(lamp, "layer", text="This Layer Only") - col.prop(lamp, "specular") - col.prop(lamp, "diffuse") + col.prop(lamp, "use_negative") + col.prop(lamp, "use_own_layer", text="This Layer Only") + col.prop(lamp, "use_specular") + col.prop(lamp, "use_diffuse") class DATA_PT_sunsky(DataButtonsPanel, bpy.types.Panel): @@ -125,7 +125,7 @@ class DATA_PT_sunsky(DataButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - lamp = context.lamp.use_sky + lamp = context.lamp.sky row = layout.row(align=True) row.prop(lamp, "use_sky") @@ -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,21 +245,21 @@ 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, "dither") - col.prop(lamp, "jitter") + col.prop(lamp, "use_umbra") + col.prop(lamp, "use_dither") + col.prop(lamp, "use_jitter") elif lamp.shadow_method == 'BUFFER_SHADOW': col = layout.column() @@ -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") @@ -352,7 +352,7 @@ class DATA_PT_spot(DataButtonsPanel, bpy.types.Panel): sub = col.column() sub.prop(lamp, "spot_size", text="Size") sub.prop(lamp, "spot_blend", text="Blend", slider=True) - col.prop(lamp, "square") + col.prop(lamp, "use_square") col.prop(lamp, "show_cone") col = split.column() diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index 730320355fd..aaf70692681 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="") @@ -228,7 +228,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): row = layout.row() row.prop(kb, "name") - if key.relative: + if key.use_relative: if ob.active_shape_key_index != 0: row = layout.row() row.active = enable_edit_value @@ -300,25 +300,25 @@ class DATA_PT_texface(MeshButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(tf, "tex") - col.prop(tf, "light") - col.prop(tf, "invisible") - col.prop(tf, "collision") + col.prop(tf, "use_bitmap_text") + col.prop(tf, "use_light") + col.prop(tf, "hide") + col.prop(tf, "use_collision") - col.prop(tf, "shared") - col.prop(tf, "twoside") - col.prop(tf, "object_color") + col.prop(tf, "use_blend_shared") + col.prop(tf, "use_twoside") + col.prop(tf, "use_object_color") col = split.column() - col.prop(tf, "halo") - col.prop(tf, "billboard") - col.prop(tf, "shadow") - col.prop(tf, "text") - col.prop(tf, "alpha_sort") + col.prop(tf, "use_halo") + col.prop(tf, "use_billboard") + col.prop(tf, "use_shadow_cast") + col.prop(tf, "use_bitmap_text") + col.prop(tf, "use_alpha_sort") col = layout.column() - col.prop(tf, "transp") + col.prop(tf, "blend_type") else: col.label(text="No UV Texture") diff --git a/release/scripts/ui/properties_data_metaball.py b/release/scripts/ui/properties_data_metaball.py index ebe21a6e623..83e5e642d0e 100644 --- a/release/scripts/ui/properties_data_metaball.py +++ b/release/scripts/ui/properties_data_metaball.py @@ -64,8 +64,8 @@ class DATA_PT_metaball(DataButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Resolution:") sub = col.column(align=True) - sub.prop(mball, "wire_size", text="View") - sub.prop(mball, "render_size", text="Render") + sub.prop(mball, "resolution", text="View") + sub.prop(mball, "render_resolution", text="Render") col = split.column() col.label(text="Settings:") diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 42fe9e26af3..46ac5ae570f 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -58,7 +58,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") sub = col.column() sub.active = bool(md.vertex_group) - sub.prop(md, "invert") + sub.prop(md, "invert_vertex_group") split = layout.split() @@ -69,8 +69,8 @@ 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_deform_preserve_volume") + col.prop(md, "use_multi_modifier") def ARRAY(self, layout, ob, md): layout.prop(md, "fit_type") @@ -78,7 +78,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): if md.fit_type == 'FIXED_COUNT': layout.prop(md, "count") elif md.fit_type == 'FIT_LENGTH': - layout.prop(md, "length") + layout.prop(md, "fit_length") elif md.fit_type == 'FIT_CURVE': layout.prop(md, "curve") @@ -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,12 +126,12 @@ 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) if md.limit_method == 'ANGLE': - layout.prop(md, "angle") + layout.prop(md, "angle_limit") elif md.limit_method == 'WEIGHT': layout.row().prop(md, "edge_weight_method", expand=True) @@ -151,12 +151,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.prop(md, "frame_start") - col.prop(md, "length") + col.prop(md, "frame_duration") col = split.column() - col.prop(md, "randomize") + col.prop(md, "use_random_order") sub = col.column() - sub.active = md.randomize + sub.active = md.use_random_order sub.prop(md, "seed") def CAST(self, layout, ob, md): @@ -168,15 +168,15 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.25) col = split.column() - col.prop(md, "x") - col.prop(md, "y") - col.prop(md, "z") + col.prop(md, "use_x") + col.prop(md, "use_y") + col.prop(md, "use_z") col = split.column() 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,11 +263,11 @@ 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") - col.prop(md, "size") + col.prop(md, "use_size") layout.operator("object.explode_refresh", text="Refresh") @@ -332,7 +332,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): sub = col.column() sub.active = bool(md.vertex_group) - sub.prop(md, "invert") + sub.prop(md, "invert_vertex_group") def MESH_DEFORM(self, layout, ob, md): split = layout.split() @@ -347,7 +347,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): sub = col.column() sub.active = bool(md.vertex_group) - sub.prop(md, "invert") + sub.prop(md, "invert_vertex_group") layout.separator() @@ -362,27 +362,27 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "precision") col = split.column() - col.prop(md, "dynamic") + col.prop(md, "use_dynamic_bind") 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() col.label(text="Axis:") - col.prop(md, "x") - col.prop(md, "y") - col.prop(md, "z") + col.prop(md, "use_x") + col.prop(md, "use_y") + col.prop(md, "use_z") 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_clip", text="Clipping") + 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:") @@ -409,7 +409,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = layout.column() row = col.row() - if md.external: + if md.is_external: row.operator("object.multires_external_pack", text="Pack External") row.label() row = col.row() @@ -420,14 +420,14 @@ 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() col.label(text="Create From:") - col.prop(md, "normal") - col.prop(md, "children") - col.prop(md, "size") + col.prop(md, "use_normal") + col.prop(md, "use_children") + col.prop(md, "use_size") col = split.column() col.label(text="Show Particles When:") @@ -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) @@ -490,41 +490,41 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Mode:") - col.prop(md, "mode", text="") + col.prop(md, "wrap_method", text="") split = layout.split(percentage=0.25) col = split.column() - if md.mode == 'PROJECT': + if md.wrap_method == 'PROJECT': col.label(text="Axis:") - col.prop(md, "x") - col.prop(md, "y") - col.prop(md, "z") + col.prop(md, "use_project_x") + col.prop(md, "use_project_y") + col.prop(md, "use_project_z") col = split.column() col.label(text="Direction:") - col.prop(md, "negative") - col.prop(md, "positive") + col.prop(md, "use_negative_direction") + col.prop(md, "use_positive_direction") 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") + elif md.wrap_method == 'NEAREST_SURFACEPOINT': + layout.prop(md, "use_keep_above_surface") def SIMPLE_DEFORM(self, layout, ob, md): split = layout.split() col = split.column() col.label(text="Mode:") - col.prop(md, "mode", text="") + col.prop(md, "deform_method", text="") col = split.column() col.label(text="Vertex Group:") @@ -536,16 +536,16 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.label(text="Origin:") col.prop(md, "origin", text="") sub = col.column() - sub.active = (md.origin != "") - sub.prop(md, "relative") + sub.active = (md.origin is not None) + sub.prop(md, "use_relative") col = split.column() col.label(text="Deform:") 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") + if md.deform_method in ('TAPER', 'STRETCH'): + col.prop(md, "lock_x") + col.prop(md, "lock_y") def SMOKE(self, layout, ob, md): layout.label(text="See Smoke panel.") @@ -555,13 +555,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Axis:") - col.prop(md, "x") - col.prop(md, "y") - col.prop(md, "z") + col.prop(md, "use_x") + col.prop(md, "use_y") + col.prop(md, "use_z") col = split.column() col.prop(md, "factor") - col.prop(md, "repeat") + col.prop(md, "iterations") col.label(text="Vertex Group:") col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") @@ -585,8 +585,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "offset") colsub = col.column() - colsub.active = (md.vertex_group is not "") - colsub.prop(md, "invert", text="Invert") + colsub.active = bool(md.vertex_group) + colsub.prop(md, "invert_vertex_group", text="Invert") col.prop(md, "use_even_offset") col.prop(md, "use_quality_normals") @@ -596,10 +596,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): colsub.active = md.use_rim colsub.prop(md, "use_rim_material") - # col = layout.column() - # col.label(text="Vertex Group:") - # col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") - def SUBSURF(self, layout, ob, md): layout.row().prop(md, "subdivision_type", expand=True) @@ -611,7 +607,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 +627,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="") @@ -650,17 +646,17 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Motion:") - col.prop(md, "x") - col.prop(md, "y") - col.prop(md, "cyclic") + col.prop(md, "use_x") + col.prop(md, "use_y") + col.prop(md, "use_cyclic") col = split.column() - col.prop(md, "normals") + col.prop(md, "use_normal") 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.active = md.use_normal + 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 +679,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 1a71f4fb280..f90a5446557 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -56,8 +56,8 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel): col.prop(ob, "hide_render", text="Invisible") # out of place but useful col = split.column() - col.prop(game, "material_physics") - col.prop(game, "rotate_from_normal") + col.prop(game, "use_material_physics") + col.prop(game, "use_rotate_from_normal") col.prop(game, "use_sleep") layout.separator() @@ -73,9 +73,9 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel): col = split.column() sub = col.column() sub.active = (game.physics_type == 'RIGID_BODY') - sub.prop(game, "anisotropic_friction") + sub.prop(game, "use_anisotropic_friction") subsub = sub.column() - subsub.active = game.anisotropic_friction + subsub.active = game.use_anisotropic_friction subsub.prop(game, "friction_coefficients", text="", slider=True) split = layout.split() @@ -83,8 +83,8 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Velocity:") sub = col.column(align=True) - sub.prop(game, "minimum_velocity", text="Minimum") - sub.prop(game, "maximum_velocity", text="Maximum") + sub.prop(game, "velocity_min", text="Minimum") + sub.prop(game, "velocity_max", text="Maximum") col = split.column() col.label(text="Damping:") @@ -98,15 +98,15 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Lock Translation:") - col.prop(game, "lock_x_axis", text="X") - col.prop(game, "lock_y_axis", text="Y") - col.prop(game, "lock_z_axis", text="Z") + col.prop(game, "lock_location_x", text="X") + col.prop(game, "lock_location_y", text="Y") + col.prop(game, "lock_location_z", text="Z") col = split.column() col.label(text="Lock Rotation:") - col.prop(game, "lock_x_rot_axis", text="X") - col.prop(game, "lock_y_rot_axis", text="Y") - col.prop(game, "lock_z_rot_axis", text="Z") + col.prop(game, "lock_rotation_x", text="X") + col.prop(game, "lock_rotation_y", text="Y") + col.prop(game, "lock_rotation_z", text="Z") elif game.physics_type == 'SOFT_BODY': col = layout.column() @@ -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': @@ -174,7 +174,7 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, bpy.types.Panel): game = context.active_object.game layout.active = game.use_collision_bounds - layout.prop(game, "collision_bounds", text="Bounds") + layout.prop(game, "collision_bounds_type", text="Bounds") split = layout.split() @@ -182,7 +182,7 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel, bpy.types.Panel): col.prop(game, "collision_margin", text="Margin", slider=True) col = split.column() - col.prop(game, "collision_compound", text="Compound") + col.prop(game, "use_collision_compound", text="Compound") class RenderButtonsPanel(): @@ -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 4c3e68686f6..265f7e08d3a 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,18 +281,18 @@ 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.prop(mat, "cubic") + sub.active = not mat.use_shadeless + sub.prop(mat, "use_tangent_shading") + sub.prop(mat, "use_cubic") elif mat.type == 'HALO': layout.prop(mat, "alpha") @@ -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,13 +342,13 @@ 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") col.prop(rayt, "filter") col.prop(rayt, "falloff") - col.prop(rayt, "limit") + col.prop(rayt, "depth_max") col.prop(rayt, "depth") col = split.column() @@ -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): @@ -493,29 +493,29 @@ class MATERIAL_PT_halo(MaterialButtonsPanel, bpy.types.Panel): col.prop(halo, "hardness") col.prop(halo, "add") col.label(text="Options:") - col.prop(halo, "texture") - col.prop(halo, "vertex_normal") - col.prop(halo, "xalpha") - col.prop(halo, "shaded") - col.prop(halo, "soft") + col.prop(halo, "use_texture") + col.prop(halo, "use_vertex_normal") + col.prop(halo, "use_extreme_alpha") + col.prop(halo, "use_shaded") + col.prop(halo, "use_soft") col = split.column() - col.prop(halo, "ring") + col.prop(halo, "use_ring") sub = col.column() - sub.active = halo.ring - sub.prop(halo, "rings") + sub.active = halo.use_ring + sub.prop(halo, "ring_count") sub.prop(mat, "mirror_color", text="") col.separator() - col.prop(halo, "lines") + col.prop(halo, "use_lines") sub = col.column() - sub.active = halo.lines - sub.prop(halo, "line_number", text="Lines") + sub.active = halo.use_lines + sub.prop(halo, "line_count", text="Lines") sub.prop(mat, "specular_color", text="") col.separator() - col.prop(halo, "star") + col.prop(halo, "use_star") sub = col.column() - sub.active = halo.star - sub.prop(halo, "star_tips") + sub.active = halo.use_star + 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,12 +571,12 @@ 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) col.prop(phys, "elasticity", slider=True) - col.prop(phys, "damp", slider=True) + col.prop(phys, "damping", slider=True) class MATERIAL_PT_strand(MaterialButtonsPanel, bpy.types.Panel): @@ -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, "exclude_mist") + 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): @@ -690,22 +690,22 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel, bpy.types.Panel): split = layout.split() 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_shadows", text="Receive") + 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,16 +881,16 @@ 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, "exclude_mist") + col.prop(mat, "use_raytrace") + col.prop(mat, "use_full_oversampling") + col.prop(mat, "use_mist") col = split.column() col.label(text="Light Group:") 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..fe60465735c 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): @@ -125,15 +125,15 @@ class ConstraintButtonsPanel(): row = layout.row() row.label(text="To:") - row.prop(con, "track", expand=True) + row.prop(con, "track_axis", expand=True) split = layout.split() col = split.column() - col.prop(con, "up", text="Up") + col.prop(con, "up_axis", 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,18 +226,18 @@ 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") row = layout.row() row.label(text="Forward:") - row.prop(con, "forward", expand=True) + row.prop(con, "forward_axis", expand=True) row = layout.row() - row.prop(con, "up", text="Up") + row.prop(con, "up_axis", text="Up") row.label() def LIMIT_ROTATION(self, context, layout, con): @@ -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() @@ -425,7 +425,7 @@ class ConstraintButtonsPanel(): row = layout.row() row.label(text="Free:") - row.prop(con, "axis", expand=True) + row.prop(con, "free_axis", expand=True) layout.prop(con, "volume") @@ -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:") @@ -466,11 +466,11 @@ class ConstraintButtonsPanel(): row = layout.row() row.label(text="To:") - row.prop(con, "track", expand=True) + row.prop(con, "track_axis", expand=True) row = layout.row() row.label(text="Lock:") - row.prop(con, "lock", expand=True) + row.prop(con, "lock_axis", expand=True) def LIMIT_DISTANCE(self, context, layout, con): self.target_template(layout, con) @@ -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") @@ -510,7 +510,7 @@ class ConstraintButtonsPanel(): split = layout.split() col = split.column() - col.prop(con, "sticky") + col.prop(con, "use_sticky") col = split.column() col.prop(con, "use_rotation") @@ -561,12 +561,12 @@ class ConstraintButtonsPanel(): row.prop(con, "main_axis", expand=True) row = layout.row() - row.prop(con, "cyclic") + row.prop(con, "use_cyclic") 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:") @@ -640,21 +640,21 @@ class ConstraintButtonsPanel(): row = layout.row() row.label(text="To:") - row.prop(con, "track", expand=True) + row.prop(con, "track_axis", expand=True) def SPLINE_IK(self, context, layout, con): self.target_template(layout, con) 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,18 @@ 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") + + def SCRIPT(self, context, layout, con): + layout.label("blender 2.5 has no py-constraints") + 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 8d306385074..8d62385be46 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -27,7 +27,7 @@ from properties_physics_common import basic_force_field_falloff_ui def particle_panel_enabled(context, psys): - return (psys.point_cache.is_baked is False) and (not psys.edited) and (not context.particle_system_editable) + return (psys.point_cache.is_baked is False) and (not psys.is_edited) and (not context.particle_system_editable) def particle_panel_poll(cls, context): @@ -143,7 +143,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): @classmethod def poll(cls, context): if particle_panel_poll(PARTICLE_PT_emission, context): - return not context.particle_system.point_cache.external + return not context.particle_system.point_cache.use_external else: return False @@ -157,7 +157,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() row.active = part.distribution != 'GRID' - row.prop(part, "amount") + row.prop(part, "count") if part.type != 'HAIR': split = layout.split() @@ -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:") @@ -176,9 +176,9 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): row.prop(part, "emit_from", expand=True) row = layout.row() - row.prop(part, "trand") + row.prop(part, "use_emit_random") 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): @@ -284,7 +284,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel): def poll(cls, context): if particle_panel_poll(PARTICLE_PT_velocity, context): psys = context.particle_system - return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.external + return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.use_external else: return False @@ -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") @@ -332,7 +332,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, bpy.types.Panel): def poll(cls, context): if particle_panel_poll(PARTICLE_PT_rotation, context): psys = context.particle_system - return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.external + return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.use_external else: return False @@ -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) @@ -374,7 +374,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): @classmethod def poll(cls, context): if particle_panel_poll(PARTICLE_PT_physics, context): - return not context.particle_system.point_cache.external + return not context.particle_system.point_cache.use_external else: return False @@ -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': @@ -472,31 +472,31 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() - row.prop(boids, "allow_flight") - row.prop(boids, "allow_land") - row.prop(boids, "allow_climb") + row.prop(boids, "use_flight") + row.prop(boids, "use_land") + row.prop(boids, "use_climb") split = layout.split() sub = split.column() col = sub.column(align=True) - col.active = boids.allow_flight - col.prop(boids, "air_max_speed") - col.prop(boids, "air_min_speed", slider=True) - col.prop(boids, "air_max_acc", slider=True) - col.prop(boids, "air_max_ave", slider=True) + col.active = boids.use_flight + col.prop(boids, "air_speed_max") + col.prop(boids, "air_speed_min", slider=True) + col.prop(boids, "air_acc_max", slider=True) + col.prop(boids, "air_ave_max", slider=True) col.prop(boids, "air_personal_space") row = col.row() - row.active = (boids.allow_land or boids.allow_climb) and boids.allow_flight - row.prop(boids, "landing_smoothness") + row.active = (boids.use_land or boids.allow_climb) and boids.allow_flight + row.prop(boids, "land_smooth") sub = split.column() col = sub.column(align=True) - col.active = boids.allow_land or boids.allow_climb - col.prop(boids, "land_max_speed") + col.active = boids.use_land or boids.allow_climb + col.prop(boids, "land_speed_max") col.prop(boids, "land_jump_speed") - col.prop(boids, "land_max_acc", slider=True) - col.prop(boids, "land_max_ave", slider=True) + col.prop(boids, "land_acc_max", slider=True) + col.prop(boids, "land_ave_max", slider=True) col.prop(boids, "land_personal_space") col.prop(boids, "land_stick_force") @@ -512,7 +512,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): col = row.column() col.label(text="Misc:") - col.prop(boids, "banking", slider=True) + col.prop(boids, "bank", slider=True) col.prop(boids, "height", slider=True) if part.physics_type == 'KEYED' or part.physics_type == 'BOIDS' or part.physics_type == 'FLUID': @@ -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': @@ -552,7 +552,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): sub.prop(key, "object", text="") sub.prop(key, "system", text="System") - layout.prop(key, "mode", expand=True) + layout.prop(key, "alliance", expand=True) elif part.physics_type == 'FLUID': sub = row.row() #doesn't work yet @@ -573,7 +573,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, bpy.types.Panel): return False if psys.settings is None: return False - if psys.point_cache.external: + if psys.point_cache.use_external: return False return psys.settings.physics_type == 'BOIDS' and engine in cls.COMPAT_ENGINES @@ -602,7 +602,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() row.prop(state, "ruleset_type") if state.ruleset_type == 'FUZZY': - row.prop(state, "rule_fuzziness", slider=True) + row.prop(state, "rule_fuzzy", slider=True) else: row.label(text="") @@ -633,26 +633,26 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, bpy.types.Panel): if rule.type == 'GOAL': row.prop(rule, "object") row = layout.row() - row.prop(rule, "predict") + row.prop(rule, "use_predict") elif rule.type == 'AVOID': row.prop(rule, "object") row = layout.row() - row.prop(rule, "predict") + row.prop(rule, "use_predict") row.prop(rule, "fear_factor") elif rule.type == 'FOLLOW_PATH': row.label(text="Not yet functional.") elif rule.type == 'AVOID_COLLISION': - row.prop(rule, "boids") - row.prop(rule, "deflectors") + row.prop(rule, "use_avoid") + row.prop(rule, "use_avoid_collision") row.prop(rule, "look_ahead") elif rule.type == 'FOLLOW_LEADER': row.prop(rule, "object", text="") row.prop(rule, "distance") row = layout.row() - row.prop(rule, "line") + row.prop(rule, "use_line") sub = row.row() sub.active = rule.line - sub.prop(rule, "queue_size") + sub.prop(rule, "queue_count") elif rule.type == 'AVERAGE_SPEED': row.prop(rule, "speed", slider=True) row.prop(rule, "wander", slider=True) @@ -689,80 +689,80 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): split = layout.split() sub = split.column() - sub.prop(part, "emitter") - sub.prop(part, "parent") + sub.prop(part, "use_render_emitter") + sub.prop(part, "use_parent_particles") 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") row.prop(part, "simplify_transition") row = layout.row() - row.prop(part, "viewport") + row.prop(part, "use_simplify_viewport") sub = row.row() 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': + row.prop(part, "draw_percentage", slider=True) + if part.draw_method != 'RENDER' or part.render_type == 'HALO': row.prop(part, "draw_size") else: row.label(text="") @@ -865,7 +865,7 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() col = row.column() col.prop(part, "show_size") - col.prop(part, "velocity") + col.prop(part, "show_velocity") col.prop(part, "show_number") if part.physics_type == 'BOIDS': col.prop(part, "show_health") @@ -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") @@ -974,7 +974,7 @@ class PARTICLE_PT_field_weights(ParticleButtonsPanel, bpy.types.Panel): effector_weights_ui(self, context, part.effector_weights) if part.type == 'HAIR': - self.layout.prop(part.effector_weights, "do_growing_hair") + self.layout.prop(part.effector_weights, "apply_to_hair_growing") class PARTICLE_PT_force_fields(ParticleButtonsPanel, bpy.types.Panel): @@ -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 7717c5b41fd..30619de5814 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -67,7 +67,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, bpy.types.Panel): split.operator("object.modifier_remove", text="Remove") row = split.row(align=True) - row.prop(md, "render", text="") + row.prop(md, "show_render", text="") row.prop(md, "show_viewport", text="") else: # add modifier @@ -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 e497492e6ff..fb9f2f981ae 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -36,9 +36,9 @@ def point_cache_ui(self, context, cache, enabled, cachetype): row = layout.row() if cachetype in ('PSYS', 'HAIR', 'SMOKE'): - row.prop(cache, "external") + row.prop(cache, "use_external") - if cache.external: + if cache.use_external: split = layout.split(percentage=0.80) split.prop(cache, "name", text="File Name") split.prop(cache, "index", text="") @@ -61,18 +61,18 @@ def point_cache_ui(self, context, cache, enabled, cachetype): col.prop(cache, "frame_start") col.prop(cache, "frame_end") if cachetype != 'SMOKE': - col.prop(cache, "step") + col.prop(cache, "frame_step") col = split.column() if cachetype != 'SMOKE': sub = col.column() sub.enabled = enabled - sub.prop(cache, "quick_cache") + sub.prop(cache, "use_quick_cache") sub = col.column() sub.enabled = (not bpy.data.is_dirty) - sub.prop(cache, "disk_cache") + sub.prop(cache, "use_disk_cache") col.label(text=cache.info) sub = col.column() @@ -127,7 +127,7 @@ def effector_weights_ui(self, context, weights): col.prop(weights, "vortex", slider=True) col.prop(weights, "magnetic", slider=True) col.prop(weights, "wind", slider=True) - col.prop(weights, "curveguide", slider=True) + col.prop(weights, "curve_guide", slider=True) col.prop(weights, "texture", slider=True) col = split.column() @@ -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 bc2b6b04479..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): @@ -180,7 +180,7 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, bpy.types.Panel): col = split.column() #row = split.row(align=True) - #row.prop(md, "render", text="") + #row.prop(md, "show_render", text="") #row.prop(md, "show_viewport", text="") coll = md.settings @@ -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 00e6aac1bce..035eefe6c2a 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -48,7 +48,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): split.operator("object.modifier_remove", text="Remove") row = split.row(align=True) - row.prop(md, "render", text="") + row.prop(md, "show_render", text="") row.prop(md, "show_viewport", text="") fluid = md.settings @@ -69,7 +69,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): layout = layout.column() if fluid.type not in ('NONE', 'DOMAIN', 'PARTICLE'): - layout.active = fluid.active + layout.active = fluid.use if fluid.type == 'DOMAIN': layout.operator("fluid.bake", text="Bake Fluid Simulation", icon='MOD_FLUIDSIM') @@ -97,10 +97,10 @@ 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, "path", text="") + layout.prop(fluid, "filepath", text="") elif fluid.type == 'FLUID': split = layout.split() @@ -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,11 +164,11 @@ 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, "path", text="") + layout.prop(fluid, "filepath", text="") elif fluid.type == 'CONTROL': split = layout.split() @@ -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 822eb129b74..d2e37ef29fb 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -53,7 +53,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel): split.operator("object.modifier_remove", text="Remove") row = split.row(align=True) - row.prop(md, "render", text="") + row.prop(md, "show_render", text="") row.prop(md, "show_viewport", text="") else: @@ -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': @@ -95,7 +95,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(flow, "outflow") + col.prop(flow, "use_outflow") col.label(text="Particle System:") col.prop_object(flow, "psys", ob, "particle_systems", text="") @@ -105,7 +105,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel): sub.prop(flow, "initial_velocity", text="Initial Velocity") sub = sub.column() sub.active = flow.initial_velocity - sub.prop(flow, "velocity_multiplier", text="Multiplier") + sub.prop(flow, "velocity_factor", text="Multiplier") sub = split.column() @@ -140,7 +140,7 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, bpy.types.Panel): col.prop(group, "fluid_group", text="") #col.label(text="Effector Group:") - #col.prop(group, "eff_group", text="") + #col.prop(group, "effector_group", text="") col = split.column() col.label(text="Collision Group:") @@ -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 c2c73a10f90..3722182caa1 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -59,7 +59,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, bpy.types.Panel): split.operator("object.modifier_remove", text="Remove") row = split.row(align=True) - row.prop(md, "render", text="") + row.prop(md, "show_render", text="") row.prop(md, "show_viewport", text="") else: # add modifier @@ -169,16 +169,16 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, bpy.types.Panel): col.label(text="Springs:") col.prop(softbody, "pull") col.prop(softbody, "push") - col.prop(softbody, "damp") + col.prop(softbody, "damping") 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 5c612bb9c5a..5e2ebf1fdcd 100644 --- a/release/scripts/ui/properties_render.py +++ b/release/scripts/ui/properties_render.py @@ -574,7 +574,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 c3e5dc9fae2..474f4a75df7 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -180,7 +180,7 @@ class TEXTURE_PT_colors(TextureButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Adjust:") - col.prop(tex, "brightness") + col.prop(tex, "intensity") col.prop(tex, "contrast") col.prop(tex, "saturation") @@ -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() @@ -289,7 +289,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): col = split.column() - col.prop(tex, "size") + col.prop(tex, "scale") class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): @@ -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_diffuse, "use_map_color_diffuse", "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, "invert", text="Negative") + col.prop(tex, "use_stencil") if type(idblock) in (bpy.types.Material, bpy.types.World): col.prop(tex, "default_value", text="DVar", slider=True) @@ -431,7 +431,7 @@ class TEXTURE_PT_clouds(TextureTypePanel, bpy.types.Panel): tex = context.texture - layout.prop(tex, "stype", expand=True) + layout.prop(tex, "cloud_type", expand=True) layout.label(text="Noise:") layout.prop(tex, "noise_type", text="Type", expand=True) layout.prop(tex, "noise_basis", text="Basis") @@ -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,20 +456,20 @@ class TEXTURE_PT_wood(TextureTypePanel, bpy.types.Panel): tex = context.texture - layout.prop(tex, "noisebasis2", expand=True) - layout.prop(tex, "stype", expand=True) + layout.prop(tex, "noisebasis_2", expand=True) + layout.prop(tex, "wood_type", expand=True) col = layout.column() - col.active = tex.stype in ('RINGNOISE', 'BANDNOISE') + col.active = tex.wood_type in ('RINGNOISE', 'BANDNOISE') col.label(text="Noise:") col.row().prop(tex, "noise_type", text="Type", expand=True) layout.prop(tex, "noise_basis", text="Basis") split = layout.split() - split.active = tex.stype in ('RINGNOISE', 'BANDNOISE') + split.active = tex.wood_type 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() @@ -486,8 +486,8 @@ 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, "marble_type", 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): @@ -550,7 +550,7 @@ class TEXTURE_PT_stucci(TextureTypePanel, bpy.types.Panel): tex = context.texture - layout.prop(tex, "stype", expand=True) + layout.prop(tex, "stucci_type", expand=True) layout.label(text="Noise:") layout.prop(tex, "noise_type", text="Type", expand=True) layout.prop(tex, "noise_basis", text="Basis") @@ -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") @@ -579,15 +579,15 @@ class TEXTURE_PT_image(TextureTypePanel, bpy.types.Panel): def texture_filter_common(tex, layout): layout.label(text="Filter:") - layout.prop(tex, "filter", text="") - if tex.mipmap and tex.filter in ('AREA', 'EWA', 'FELINE'): + layout.prop(tex, "filter_type", text="") + if tex.use_mipmap and tex.filter_type in ('AREA', 'EWA', 'FELINE'): if tex.filter == 'FELINE': layout.prop(tex, "filter_probes", text="Probes") else: 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,23 +607,23 @@ 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") + col.prop(tex, "use_mipmap") row = col.row() - row.active = tex.mipmap - row.prop(tex, "mipmap_gauss") - col.prop(tex, "interpolation") + row.active = tex.use_mipmap + row.prop(tex, "use_mipmap_gauss") + col.prop(tex, "use_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") @@ -708,7 +708,7 @@ class TEXTURE_PT_envmap(TextureTypePanel, bpy.types.Panel): split = layout.split() col = split.column() - col.prop(env, "ignore_layers") + col.prop(env, "layers_ignore") col.prop(env, "resolution") col.prop(env, "depth") @@ -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': @@ -863,12 +863,12 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel): elif vd.file_format == 'IMAGE_SEQUENCE': layout.template_ID(tex, "image", open="image.open") layout.template_image(tex, "image", tex.image_user, compact=True) - #layout.prop(vd, "frames") + #layout.prop(vd, "frame_duration") - layout.prop(vd, "still") + layout.prop(vd, "use_still_frame") row = layout.row() - row.active = vd.still - row.prop(vd, "still_frame_number") + row.active = vd.use_still_frame + 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..a42516a63b4 100644 --- a/release/scripts/ui/properties_world.py +++ b/release/scripts/ui/properties_world.py @@ -20,6 +20,8 @@ import bpy from rna_prop_ui import PropertyPanel +# TODO, "color_range" not in the UI + class WorldButtonsPanel(): bl_space_type = 'PROPERTIES' @@ -78,15 +80,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") @@ -95,18 +97,18 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel, bpy.types.Panel): COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): - light = context.world.lighting + light = context.world.light_settings self.layout.prop(light, "use_ambient_occlusion", text="") def draw(self, context): layout = self.layout - light = context.world.lighting + light = context.world.light_settings layout.active = light.use_ambient_occlusion 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): @@ -114,14 +116,14 @@ class WORLD_PT_environment_lighting(WorldButtonsPanel, bpy.types.Panel): COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): - light = context.world.lighting - self.layout.prop(light, "use_environment_lighting", text="") + light = context.world.light_settings + self.layout.prop(light, "use_environment_light", text="") def draw(self, context): layout = self.layout - light = context.world.lighting + light = context.world.light_settings - layout.active = light.use_environment_lighting + layout.active = light.use_environment_light split = layout.split() split.prop(light, "environment_energy", text="Energy") @@ -134,18 +136,18 @@ class WORLD_PT_indirect_lighting(WorldButtonsPanel, bpy.types.Panel): @classmethod def poll(cls, context): - light = getattr(context.world, "lighting", None) + light = getattr(context.world, "light_settings", None) return light and light.gather_method == 'APPROXIMATE' def draw_header(self, context): - light = context.world.lighting - self.layout.prop(light, "use_indirect_lighting", text="") + light = context.world.light_settings + self.layout.prop(light, "use_indirect_light", text="") def draw(self, context): layout = self.layout - light = context.world.lighting + light = context.world.light_settings - layout.active = light.use_indirect_lighting + layout.active = light.use_indirect_light split = layout.split() split.prop(light, "indirect_factor", text="Factor") @@ -158,9 +160,9 @@ class WORLD_PT_gather(WorldButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - light = context.world.lighting + light = context.world.light_settings - 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) @@ -170,9 +172,9 @@ class WORLD_PT_gather(WorldButtonsPanel, bpy.types.Panel): col.label(text="Attenuation:") if light.gather_method == 'RAYTRACE': col.prop(light, "distance") - col.prop(light, "falloff") + col.prop(light, "use_falloff") sub = col.row() - sub.active = light.falloff + sub.active = light.use_falloff sub.prop(light, "falloff_strength", text="Strength") if light.gather_method == 'RAYTRACE': @@ -195,8 +197,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") @@ -208,25 +210,25 @@ class WORLD_PT_mist(WorldButtonsPanel, bpy.types.Panel): def draw_header(self, context): world = context.world - self.layout.prop(world.mist, "use_mist", text="") + self.layout.prop(world.mist_settings, "use_mist", text="") def draw(self, context): layout = self.layout world = context.world - layout.active = world.mist.use_mist + layout.active = world.mist_settings.use_mist split = layout.split() col = split.column() - col.prop(world.mist, "intensity", slider=True) - col.prop(world.mist, "start") + col.prop(world.mist_settings, "intensity", slider=True) + col.prop(world.mist_settings, "start") col = split.column() - col.prop(world.mist, "depth") - col.prop(world.mist, "height") + col.prop(world.mist_settings, "depth") + col.prop(world.mist_settings, "height") - layout.prop(world.mist, "falloff") + layout.prop(world.mist_settings, "falloff") class WORLD_PT_stars(WorldButtonsPanel, bpy.types.Panel): @@ -237,23 +239,23 @@ class WORLD_PT_stars(WorldButtonsPanel, bpy.types.Panel): def draw_header(self, context): world = context.world - self.layout.prop(world.stars, "use_stars", text="") + self.layout.prop(world.star_settings, "use_stars", text="") def draw(self, context): layout = self.layout world = context.world - layout.active = world.stars.use_stars + layout.active = world.star_settings.use_stars split = layout.split() col = split.column() - col.prop(world.stars, "size") - col.prop(world.stars, "color_randomization", text="Colors") + col.prop(world.star_settings, "size") + col.prop(world.star_settings, "color_random", text="Colors") col = split.column() - col.prop(world.stars, "min_distance", text="Min. Dist") - col.prop(world.stars, "average_separation", text="Separation") + col.prop(world.star_settings, "distance_min", text="Min. Dist") + col.prop(world.star_settings, "average_separation", text="Separation") class WORLD_PT_custom_props(WorldButtonsPanel, PropertyPanel, bpy.types.Panel): diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index bcb227b55ec..11324b59b3b 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") + col.prop(ima, "use_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_logic.py b/release/scripts/ui/space_logic.py index f2d99c6e447..1272a5db9d1 100644 --- a/release/scripts/ui/space_logic.py +++ b/release/scripts/ui/space_logic.py @@ -45,7 +45,7 @@ class LOGIC_PT_properties(bpy.types.Panel): row.prop(prop, "name", text="") row.prop(prop, "type", text="") row.prop(prop, "value", text="", toggle=True) # we dont care about the type. rna will display correctly - row.prop(prop, "debug", text="", toggle=True, icon='INFO') + row.prop(prop, "show_debug", text="", toggle=True, icon='INFO') row.operator("object.game_property_remove", text="", icon='X', emboss=False).index = i diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index a331e747fdb..ec607629757 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:") @@ -476,10 +476,10 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, bpy.types.Panel): layout.prop(strip, "use_crop", text="Image Crop:") if strip.use_crop: col = layout.column(align=True) - col.prop(strip.crop, "top") - col.prop(strip.crop, "left") - col.prop(strip.crop, "bottom") - col.prop(strip.crop, "right") + col.prop(strip.crop, "max_y") + col.prop(strip.crop, "min_x") + col.prop(strip.crop, "min_y") + col.prop(strip.crop, "max_x") def draw_panel_transform(self, strip): layout = self.layout @@ -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: @@ -576,10 +576,10 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, bpy.types.Panel): layout.prop(strip, "use_crop", text="Image Crop:") if strip.use_crop: col = layout.column(align=True) - col.prop(strip.crop, "top") - col.prop(strip.crop, "left") - col.prop(strip.crop, "bottom") - col.prop(strip.crop, "right") + col.prop(strip.crop, "max_y") + col.prop(strip.crop, "min_x") + col.prop(strip.crop, "min_y") + col.prop(strip.crop, "max_x") col = layout.column(align=True) col.label(text="Trim Duration:") @@ -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 5a74a0a5b38..f966f8a7e8b 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -299,9 +299,8 @@ class InputKeyMapPanel(bpy.types.Panel): if title: box.label(text=title) flow = box.column_flow(columns=2) - for pname in dir(properties): + for pname, value in properties.items(): if not properties.is_property_hidden(pname): - value = eval("properties." + pname) if isinstance(value, bpy.types.OperatorProperties): display_properties(value, title=pname) else: @@ -388,9 +387,8 @@ def export_properties(prefix, properties, lines=None): if lines is None: lines = [] - for pname in properties.keys(): + for value, pname in properties.items(): if not properties.is_property_hidden(pname): - value = getattr(properties, pname) if isinstance(value, bpy.types.OperatorProperties): export_properties(prefix + "." + pname, value, lines) elif properties.is_property_set(pname): diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 36502564e1f..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': @@ -1011,9 +1011,9 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): sculpt = tool_settings.sculpt brush = tool_settings.sculpt.brush - layout.prop(sculpt, "symmetry_x") - layout.prop(sculpt, "symmetry_y") - layout.prop(sculpt, "symmetry_z") + layout.prop(sculpt, "use_symmetry_x") + layout.prop(sculpt, "use_symmetry_y") + layout.prop(sculpt, "use_symmetry_z") layout.separator() layout.prop(sculpt, "lock_x") layout.prop(sculpt, "lock_y") @@ -1038,7 +1038,7 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): layout.operator("sculpt.set_persistent_base") layout.separator() - layout.prop(sculpt, "use_openmp", text="Threaded Sculpt") + layout.prop(sculpt, "use_threaded", text="Threaded Sculpt") layout.prop(sculpt, "show_brush") # TODO, make availabel from paint menu! @@ -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") @@ -2063,7 +2063,7 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): row.prop(region, "show_sync_view") row = col.row() row.enabled = region.lock_rotation and region.show_sync_view - row.prop(region, "box_clip") + row.prop(region, "use_box_clip") class VIEW3D_PT_view3d_meshdisplay(bpy.types.Panel): @@ -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 4ff90c53d3c..ddd0998f4c6 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': @@ -998,7 +998,7 @@ class VIEW3D_PT_sculpt_options(PaintPanel, bpy.types.Panel): col = split.column() - col.prop(sculpt, "use_openmp", text="Threaded Sculpt") + col.prop(sculpt, "use_threaded", text="Threaded Sculpt") col.prop(sculpt, "show_low_resolution") col.prop(sculpt, "show_brush") @@ -1037,13 +1037,13 @@ class VIEW3D_PT_sculpt_symmetry(PaintPanel, bpy.types.Panel): col = split.column() col.label(text="Mirror:") - col.prop(sculpt, "symmetry_x", text="X") - col.prop(sculpt, "symmetry_y", text="Y") - col.prop(sculpt, "symmetry_z", text="Z") + col.prop(sculpt, "use_symmetry_x", text="X") + col.prop(sculpt, "use_symmetry_y", text="Y") + col.prop(sculpt, "use_symmetry_z", text="Z") col = split.column() - col.prop(sculpt, "radial_symm", text="Radial") + col.prop(sculpt, "radial_symmetry", text="Radial") col = layout.column() @@ -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, "normals") - col.prop(vpaint, "spray") + col.prop(vpaint, "use_all_faces") + col.prop(vpaint, "use_normal") + col.prop(vpaint, "use_spray") col.label(text="Unified Settings:") col.prop(tool_settings, "sculpt_paint_use_unified_size", text="Size") @@ -1196,7 +1196,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPanel, bpy.types.Panel): sub = col.column() sub.active = use_projection sub.prop(ipaint, "use_occlude") - sub.prop(ipaint, "use_backface_cull") + sub.prop(ipaint, "use_backface_culling") split = layout.split() @@ -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/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c index 64a6e14bc5d..341eb38b388 100644 --- a/source/blender/blenkernel/intern/BME_conversions.c +++ b/source/blender/blenkernel/intern/BME_conversions.c @@ -531,6 +531,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm) MFace *mface, *mf; MEdge *medge, *me; MVert *mvert, *mv; + int *origindex; int totface,totedge,totvert,i,bmeshok,len, numTex, numCol; BME_Vert *v1=NULL; @@ -577,13 +578,16 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm) /*Make Verts*/ mvert = CDDM_get_verts(result); + origindex = result->getVertDataArray(result, CD_ORIGINDEX); for(i=0,v1=bm->verts.first,mv=mvert;v1;v1=v1->next,i++,mv++){ VECCOPY(mv->co,v1->co); mv->flag = (unsigned char)v1->flag; mv->bweight = (char)(255.0*v1->bweight); CustomData_from_bmesh_block(&bm->vdata, &result->vertData, &v1->data, i); + origindex[i] = ORIGINDEX_NONE; } medge = CDDM_get_edges(result); + origindex = result->getEdgeDataArray(result, CD_ORIGINDEX); i=0; for(e=bm->edges.first,me=medge;e;e=e->next){ if(e->tflag2){ @@ -600,12 +604,14 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm) me->bweight = (char)(255.0*e->bweight); me->flag = e->flag; CustomData_from_bmesh_block(&bm->edata, &result->edgeData, &e->data, i); + origindex[i] = ORIGINDEX_NONE; me++; i++; } } if(totface){ mface = CDDM_get_faces(result); + origindex = result->getFaceDataArray(result, CD_ORIGINDEX); /*make faces*/ for(i=0,f=bm->polys.first;f;f=f->next){ mf = &mface[i]; @@ -625,6 +631,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm) mf->flag = (unsigned char)f->flag; CustomData_from_bmesh_block(&bm->pdata, &result->faceData, &f->data, i); BME_DMloops_to_corners(bm, &result->faceData, i, f,numCol,numTex); + origindex[i] = ORIGINDEX_NONE; i++; } } diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index 2f91d8eee68..191316711f4 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -119,7 +119,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s but= uiDefButR(block, MENU, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "mode", -1, 0, 0, -1, -1, NULL); uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL); - uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "additive", -1, 0, 0, -1, -1, NULL); + uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "use_additive", -1, 0, 0, -1, -1, NULL); uiBlockEndAlign(block); /* now add settings for individual modes */ @@ -226,7 +226,7 @@ static void draw_modifier__fn_generator(uiLayout *layout, ID *id, FModifier *fcm /* add the settings */ col= uiLayoutColumn(layout, 1); uiItemR(col, &ptr, "function_type", 0, "", 0); - uiItemR(col, &ptr, "additive", UI_ITEM_R_TOGGLE, NULL, 0); + uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, 0); col= uiLayoutColumn(layout, 0); // no grouping for now uiItemR(col, &ptr, "amplitude", 0, NULL, 0); @@ -254,14 +254,14 @@ static void draw_modifier__cycles(uiLayout *layout, ID *id, FModifier *fcm, shor /* before range */ col= uiLayoutColumn(split, 1); uiItemL(col, "Before:", 0); - uiItemR(col, &ptr, "before_mode", 0, "", 0); - uiItemR(col, &ptr, "before_cycles", 0, NULL, 0); + uiItemR(col, &ptr, "mode_before", 0, "", 0); + uiItemR(col, &ptr, "cycles_before", 0, NULL, 0); /* after range */ col= uiLayoutColumn(split, 1); uiItemL(col, "After:", 0); - uiItemR(col, &ptr, "after_mode", 0, "", 0); - uiItemR(col, &ptr, "after_cycles", 0, NULL, 0); + uiItemR(col, &ptr, "mode_after", 0, "", 0); + uiItemR(col, &ptr, "cycles_after", 0, NULL, 0); } /* --------------- */ @@ -473,8 +473,8 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh uiItemR(col, &ptr, "reference_value", 0, NULL, 0); row= uiLayoutRow(col, 1); - uiItemR(row, &ptr, "default_minimum", 0, "Min", 0); - uiItemR(row, &ptr, "default_maximum", 0, "Max", 0); + uiItemR(row, &ptr, "default_min", 0, "Min", 0); + uiItemR(row, &ptr, "default_max", 0, "Max", 0); /* control points header */ // TODO: move this control-point control stuff to using the new special widgets for lists @@ -526,13 +526,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor /* x-minimum */ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_minimum_x", 0, NULL, 0); - uiItemR(col, &ptr, "minimum_x", 0, NULL, 0); + uiItemR(col, &ptr, "use_min_x", 0, NULL, 0); + uiItemR(col, &ptr, "min_x", 0, NULL, 0); /* y-minimum*/ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_minimum_y", 0, NULL, 0); - uiItemR(col, &ptr, "minimum_y", 0, NULL, 0); + uiItemR(col, &ptr, "use_min_y", 0, NULL, 0); + uiItemR(col, &ptr, "min_y", 0, NULL, 0); } /* row 2: maximum */ @@ -544,13 +544,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor /* x-minimum */ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_maximum_x", 0, NULL, 0); - uiItemR(col, &ptr, "maximum_x", 0, NULL, 0); + uiItemR(col, &ptr, "use_max_x", 0, NULL, 0); + uiItemR(col, &ptr, "max_x", 0, NULL, 0); /* y-minimum*/ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_maximum_y", 0, NULL, 0); - uiItemR(col, &ptr, "maximum_y", 0, NULL, 0); + uiItemR(col, &ptr, "use_max_y", 0, NULL, 0); + uiItemR(col, &ptr, "max_y", 0, NULL, 0); } } @@ -567,8 +567,8 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho /* block 1: "stepping" settings */ col= uiLayoutColumn(layout, 0); - uiItemR(col, &ptr, "step_size", 0, NULL, 0); - uiItemR(col, &ptr, "offset", 0, NULL, 0); + uiItemR(col, &ptr, "frame_step", 0, NULL, 0); + uiItemR(col, &ptr, "frame_offset", 0, NULL, 0); /* block 2: start range settings */ col= uiLayoutColumn(layout, 1); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 19af504ecb6..f2759a20f51 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -747,7 +747,7 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif if ( ((md->type!=eModifierType_Softbody && md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) && (md->type!=eModifierType_Surface) ) { - uiItemR(row, &ptr, "render", 0, "", 0); + uiItemR(row, &ptr, "show_render", 0, "", 0); uiItemR(row, &ptr, "show_viewport", 0, "", 0); if (mti->flags & eModifierTypeFlag_SupportsEditmode) 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/object/object_ops.c b/source/blender/editors/object/object_ops.c index 190c4ebc228..6e9e8eeb5e5 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -386,25 +386,25 @@ void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keym if(do_pet) { /* context ops */ kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY, KM_PRESS, KM_SHIFT, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_editing_falloff"); + RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit_falloff"); // Object mode if (do_pet == 1) { kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_editing_objects"); + RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_proportional_edit_objects"); } else { // Edit mode kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, 0, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_editing"); + RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit"); RNA_string_set(kmi->ptr, "value_1", "DISABLED"); RNA_string_set(kmi->ptr, "value_2", "ENABLED"); /* for modes/object types that allow 'connected' mode, add the Alt O key */ if (do_pet == 3) { kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0); - RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_editing"); + RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_edit"); RNA_string_set(kmi->ptr, "value_1", "DISABLED"); RNA_string_set(kmi->ptr, "value_2", "CONNECTED"); } diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 2b579ef8af3..71bee8c5b08 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -548,8 +548,8 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r newrect.ymax= rect->ymin; if(parent) { - ok = ed_preview_draw_rect(sa, sce, parent, 1, 1, rect, &newrect); - ok &= ed_preview_draw_rect(sa, sce, id, 1, 0, rect, &newrect); + ok = ed_preview_draw_rect(sa, sce, id, 1, 1, rect, &newrect); + ok &= ed_preview_draw_rect(sa, sce, parent, 1, 0, rect, &newrect); } else ok = ed_preview_draw_rect(sa, sce, id, 0, 0, rect, &newrect); @@ -999,8 +999,8 @@ static void shader_preview_startjob(void *customdata, short *stop, short *do_upd sp->do_update= do_update; if(sp->parent) { - shader_preview_render(sp, sp->parent, 1, 1); - shader_preview_render(sp, sp->id, 1, 0); + shader_preview_render(sp, sp->id, 1, 1); + shader_preview_render(sp, sp->parent, 1, 0); } else shader_preview_render(sp, sp->id, 0, 0); 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/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 553343a8b21..669ec07b7ed 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1144,10 +1144,16 @@ static int vpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *ev { Paint *p = paint_get_active(CTX_data_scene(C)); Brush *brush = paint_brush(p); + float col[4]; WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor); p->paint_cursor = NULL; brush_radial_control_invoke(op, brush, 1); + + copy_v3_v3(col, brush->add_col); + col[3]= 0.5f; + RNA_float_set_array(op->ptr, "color", col); + return WM_radial_control_invoke(C, op, event); } @@ -1173,10 +1179,16 @@ static int wpaint_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *ev { Paint *p = paint_get_active(CTX_data_scene(C)); Brush *brush = paint_brush(p); + float col[4]; WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor); p->paint_cursor = NULL; brush_radial_control_invoke(op, brush, 1); + + copy_v3_v3(col, brush->add_col); + col[3]= 0.5f; + RNA_float_set_array(op->ptr, "color", col); + return WM_radial_control_invoke(C, op, event); } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index d8df9684cff..10af35a1b4b 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -2726,10 +2726,24 @@ static int sculpt_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *ev { Paint *p = paint_get_active(CTX_data_scene(C)); Brush *brush = paint_brush(p); + float col[4], tex_col[4]; WM_paint_cursor_end(CTX_wm_manager(C), p->paint_cursor); p->paint_cursor = NULL; brush_radial_control_invoke(op, brush, 1); + + if((brush->flag & BRUSH_DIR_IN) && ELEM4(brush->sculpt_tool, SCULPT_TOOL_DRAW, SCULPT_TOOL_INFLATE, SCULPT_TOOL_CLAY, SCULPT_TOOL_PINCH)) + copy_v3_v3(col, brush->sub_col); + else + copy_v3_v3(col, brush->add_col); + col[3]= 0.5f; + + copy_v3_v3(tex_col, U.sculpt_paint_overlay_col); + tex_col[3]= (brush->texture_overlay_alpha / 100.0f); + + RNA_float_set_array(op->ptr, "color", col); + RNA_float_set_array(op->ptr, "texture_color", tex_col); + return WM_radial_control_invoke(C, op, event); } diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index b333846ac96..14f684dd9e3 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -150,7 +150,7 @@ static void graph_panel_view(const bContext *C, Panel *pa) uiItemR(row, &sceneptr, "frame_current", 0, "Cursor X", 0); uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_CFRA); row= uiLayoutSplit(subcol, 0.7, 1); - uiItemR(row, &spaceptr, "cursor_value", 0, "Cursor Y", 0); + uiItemR(row, &spaceptr, "cursor_position_y", 0, "Cursor Y", 0); uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_VALUE); } diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 01378d9ef85..5c692ba1112 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -1043,7 +1043,7 @@ static int graphkeys_sound_bake_exec(bContext *C, wmOperator *op) RNA_float_get(op->ptr, "release"), RNA_float_get(op->ptr, "threshold"), RNA_boolean_get(op->ptr, "accumulate"), - RNA_boolean_get(op->ptr, "additive"), + RNA_boolean_get(op->ptr, "use_additive"), RNA_boolean_get(op->ptr, "square"), RNA_float_get(op->ptr, "sthreshold"), FPS, &sbi.length); @@ -1118,7 +1118,7 @@ void GRAPH_OT_sound_bake (wmOperatorType *ot) RNA_def_float(ot->srna, "release", 0.2, 0.0, 5.0, "Release time", "", 0.01, 0.2); RNA_def_float(ot->srna, "threshold", 0.0, 0.0, 1.0, "Threshold", "", 0.01, 0.1); RNA_def_boolean(ot->srna, "accumulate", 0, "Accumulate", ""); - RNA_def_boolean(ot->srna, "additive", 0, "Additive", ""); + RNA_def_boolean(ot->srna, "use_additive", 0, "Additive", ""); RNA_def_boolean(ot->srna, "square", 0, "Square", ""); RNA_def_float(ot->srna, "sthreshold", 0.1, 0.0, 1.0, "Square Threshold", "", 0.01, 0.1); } diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 06ed4d61657..054cd69443a 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,8 +909,8 @@ 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, "cyclic", 0, NULL, 0); + uiItemR(col, userptr, "use_auto_refresh", 0, NULL, 0); + uiItemR(col, userptr, "use_cyclic", 0, NULL, 0); } else if(ima->source==IMA_SRC_GENERATED) { split= uiLayoutSplit(layout, 0, 0); diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 334efb1479b..8a703c510c4 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -4508,13 +4508,13 @@ static void logic_buttons_new(bContext *C, ARegion *ar) subsplit= uiLayoutSplit(split, 0.85, 0); col= uiLayoutColumn(subsplit, 0); row= uiLayoutRow(col, 0); - uiLayoutSetActive(row, RNA_boolean_get(&settings_ptr, "all_states")==0); - uiTemplateLayers(row, &settings_ptr, "visible_state", &settings_ptr, "used_states", 0); + uiLayoutSetActive(row, RNA_boolean_get(&settings_ptr, "use_all_states")==0); + uiTemplateLayers(row, &settings_ptr, "states_visible", &settings_ptr, "used_states", 0); row= uiLayoutRow(col, 0); - uiTemplateLayers(row, &settings_ptr, "initial_state", &settings_ptr, "used_states", 0); + uiTemplateLayers(row, &settings_ptr, "states_initial", &settings_ptr, "used_states", 0); col= uiLayoutColumn(subsplit, 0); - uiItemR(col, &settings_ptr, "all_states", UI_ITEM_R_TOGGLE, NULL, 0); + uiItemR(col, &settings_ptr, "use_all_states", UI_ITEM_R_TOGGLE, NULL, 0); uiItemR(col, &settings_ptr, "show_debug_state", 0, "", 0); } diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 6ff9922c555..fc869c4b46f 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -293,26 +293,26 @@ 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); + uiItemR(column, &strip_ptr, "use_reverse", 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..c1b888fcf83 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -113,7 +113,7 @@ static void node_buts_mix_rgb(uiLayout *layout, bContext *C, PointerRNA *ptr) row= uiLayoutRow(layout, 1); uiItemR(row, ptr, "blend_type", 0, "", 0); if(ntree->type == NTREE_COMPOSIT) - uiItemR(row, ptr, "alpha", 0, "", ICON_IMAGE_RGB_ALPHA); + uiItemR(row, ptr, "use_alpha", 0, "", ICON_IMAGE_RGB_ALPHA); } static void node_buts_time(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -134,8 +134,8 @@ static void node_buts_time(uiLayout *layout, bContext *C, PointerRNA *ptr) uiTemplateCurveMapping(layout, ptr, "curve", 's', 0, 0); row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "start", 0, "Sta", 0); - uiItemR(row, ptr, "end", 0, "End", 0); + uiItemR(row, ptr, "frame_start", 0, "Sta", 0); + uiItemR(row, ptr, "frame_end", 0, "End", 0); } static void node_buts_colorramp(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -307,8 +307,8 @@ static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA if(!node->id) return; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "diffuse", 0, NULL, 0); - uiItemR(col, ptr, "specular", 0, NULL, 0); + uiItemR(col, ptr, "use_diffuse", 0, NULL, 0); + uiItemR(col, ptr, "use_specular", 0, NULL, 0); uiItemR(col, ptr, "invert_normal", 0, NULL, 0); } @@ -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); } @@ -478,11 +478,11 @@ static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA * if (ELEM(RNA_enum_get(&imaptr, "source"), IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) { col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "frames", 0, NULL, 0); - 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, "frame_duration", 0, NULL, 0); + uiItemR(col, ptr, "frame_start", 0, NULL, 0); + uiItemR(col, ptr, "frame_offset", 0, NULL, 0); + uiItemR(col, ptr, "use_cyclic", 0, NULL, 0); + uiItemR(col, ptr, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0); } col= uiLayoutColumn(layout, 0); @@ -532,19 +532,19 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *C, PointerRNA *p uiItemR(col, ptr, "filter_type", 0, "", 0); if (RNA_enum_get(ptr, "filter_type")!= R_FILTER_FAST_GAUSS) { - uiItemR(col, ptr, "bokeh", 0, NULL, 0); - uiItemR(col, ptr, "gamma", 0, NULL, 0); + uiItemR(col, ptr, "use_bokeh", 0, NULL, 0); + uiItemR(col, ptr, "use_gamma_correction", 0, NULL, 0); } - uiItemR(col, ptr, "relative", 0, NULL, 0); + uiItemR(col, ptr, "use_relative", 0, NULL, 0); col= uiLayoutColumn(layout, 1); - if (RNA_boolean_get(ptr, "relative")) { + if (RNA_boolean_get(ptr, "use_relative")) { uiItemR(col, ptr, "factor_x", 0, "X", 0); 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,12 +668,12 @@ 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); - uiItemR(col, ptr, "jitter", 0, NULL, 0); - uiItemR(col, ptr, "fit", 0, NULL, 0); + uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector")==0); + uiItemR(col, ptr, "use_jitter", 0, NULL, 0); + uiItemR(col, ptr, "use_fit", 0, NULL, 0); } static void node_composit_buts_vecblur(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -686,10 +686,10 @@ 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); + uiItemR(layout, ptr, "use_curved", 0, NULL, 0); } static void node_composit_buts_filter(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -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,8 +819,8 @@ 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, "cutoff", 0, NULL, 0); + uiItemR(col, ptr, "tolerance", 0, NULL, 0); + uiItemR(col, ptr, "threshold", 0, NULL, 0); col= uiLayoutColumn(layout, 1); /*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, 0); Removed for now */ @@ -833,9 +833,9 @@ static void node_composit_buts_color_matte(uiLayout *layout, bContext *C, Pointe uiLayout *col; col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "h", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "s", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "v", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, 0); } static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -849,19 +849,19 @@ static void node_composit_buts_channel_matte(uiLayout *layout, bContext *C, Poin col=uiLayoutColumn(layout, 0); uiItemL(col, "Key Channel:", 0); row= uiLayoutRow(col, 0); - uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0); + uiItemR(row, ptr, "matte_channel", UI_ITEM_R_EXPAND, NULL, 0); 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); } - uiItemR(col, ptr, "high", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "low", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, 0); } static void node_composit_buts_luma_matte(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -869,8 +869,8 @@ static void node_composit_buts_luma_matte(uiLayout *layout, bContext *C, Pointer uiLayout *col; col= uiLayoutColumn(layout, 1); - uiItemR(col, ptr, "high", UI_ITEM_R_SLIDER, NULL, 0); - uiItemR(col, ptr, "low", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, 0); } static void node_composit_buts_map_uv(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -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) { @@ -915,7 +915,7 @@ static void node_composit_buts_scale(uiLayout *layout, bContext *C, PointerRNA * static void node_composit_buts_rotate(uiLayout *layout, bContext *C, PointerRNA *ptr) { - uiItemR(layout, ptr, "filter", 0, "", 0); + uiItemR(layout, ptr, "filter_type", 0, "", 0); } static void node_composit_buts_invert(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -923,8 +923,8 @@ static void node_composit_buts_invert(uiLayout *layout, bContext *C, PointerRNA uiLayout *col; col= uiLayoutColumn(layout, 0); - uiItemR(col, ptr, "rgb", 0, NULL, 0); - uiItemR(col, ptr, "alpha", 0, NULL, 0); + uiItemR(col, ptr, "invert_rgb", 0, NULL, 0); + uiItemR(col, ptr, "invert_alpha", 0, NULL, 0); } static void node_composit_buts_premulkey(uiLayout *layout, bContext *C, PointerRNA *ptr) @@ -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); @@ -1209,7 +1209,7 @@ static void node_texture_buts_image(uiLayout *layout, bContext *C, PointerRNA *p static void node_texture_buts_output(uiLayout *layout, bContext *C, PointerRNA *ptr) { - uiItemR(layout, ptr, "output_name", 0, "", 0); + uiItemR(layout, ptr, "filepath", 0, "", 0); } /* only once called */ diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index e23276cecad..967b800b97f 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5470,10 +5470,9 @@ static void draw_hooks(Object *ob) // void drawRBpivot(bRigidBodyJointConstraint *data) { - float radsPerDeg = 6.283185307179586232f / 360.f; int axis; float v1[3]= {data->pivX, data->pivY, data->pivZ}; - float eu[3]= {radsPerDeg*data->axX, radsPerDeg*data->axY, radsPerDeg*data->axZ}; + float eu[3]= {data->axX, data->axY, data->axZ}; float mat[4][4]; eul_to_mat4(mat,eu); diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 19d182de54b..a0167c87d87 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -354,7 +354,7 @@ static void v3d_editvertex_buts(const bContext *C, uiLayout *layout, View3D *v3d if(totedge==1) uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Crease:", 0, 20, 200, 20, &(tfp->ve_median[3]), 0.0, 1.0, 10, 3, ""); else if(totedge>1) - uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Median Crease:", 0, 20, 200, 20, &(tfp->ve_median[3]), 0.0, 1.0, 10, 3, ""); + uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, "Mean Crease:", 0, 20, 200, 20, &(tfp->ve_median[3]), 0.0, 1.0, 10, 3, ""); } else { // apply diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 6768141e6d9..9ee12a8ef1e 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -275,7 +275,7 @@ void view3d_keymap(wmKeyConfig *keyconf) RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point_align"); kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* new in 2.5 */ - RNA_string_set(kmi->ptr, "data_path", "space_data.manipulator"); + RNA_string_set(kmi->ptr, "data_path", "space_data.show_manipulator"); kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0); RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point"); diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 3a642e1256c..cd447e5e43a 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -77,7 +77,7 @@ const char *imb_ext_image[] = { #ifdef WITH_TIFF ".tif", ".tiff", ".tx", #endif -#ifdef WITH_BF_OPENJPEG +#ifdef WITH_OPENJPEG ".jp2", #endif #ifdef WITH_HDR @@ -90,7 +90,7 @@ const char *imb_ext_image[] = { ".dpx", ".cin", #endif -#ifdef WITH_BF_OPENEXR +#ifdef WITH_OPENEXR ".exr", #endif NULL}; diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 722adba1136..27f9c9cd5f3 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -66,6 +66,9 @@ typedef enum ModifierType { eModifierType_ShapeKey, eModifierType_Solidify, eModifierType_Screw, + /* placeholder, keep this so durian files load in + * trunk with the correct modifier once its merged */ + eModifierType_Warp, NUM_MODIFIER_TYPES } ModifierType; diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index c1ae5c3a6c1..9f41a189435 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -624,8 +624,9 @@ void RNA_struct_py_type_set(StructRNA *srna, void *py_type); void *RNA_struct_blender_type_get(StructRNA *srna); void RNA_struct_blender_type_set(StructRNA *srna, void *blender_type); -struct IDProperty *RNA_struct_idproperties(PointerRNA *ptr, int create); -int RNA_struct_idproperties_check(StructRNA *srna); +struct IDProperty *RNA_struct_idprops(PointerRNA *ptr, int create); +int RNA_struct_idprops_check(StructRNA *srna); +int RNA_struct_idprops_register_check(StructRNA *type); PropertyRNA *RNA_struct_find_property(PointerRNA *ptr, const char *identifier); diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h index 9aadd8900e5..f6ae5dcdbbd 100644 --- a/source/blender/makesrna/RNA_define.h +++ b/source/blender/makesrna/RNA_define.h @@ -57,7 +57,7 @@ void RNA_def_struct_nested(BlenderRNA *brna, StructRNA *srna, const char *struct void RNA_def_struct_flag(StructRNA *srna, int flag); void RNA_def_struct_clear_flag(StructRNA *srna, int flag); void RNA_def_struct_refine_func(StructRNA *srna, const char *refine); -void RNA_def_struct_idproperties_func(StructRNA *srna, const char *refine); +void RNA_def_struct_idprops_func(StructRNA *srna, const char *refine); void RNA_def_struct_register_funcs(StructRNA *srna, const char *reg, const char *unreg); void RNA_def_struct_path_func(StructRNA *srna, const char *path); void RNA_def_struct_identifier(StructRNA *srna, const char *identifier); diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 1f08f76661c..87cae002a12 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -298,7 +298,8 @@ typedef enum StructFlag { /* internal flags */ STRUCT_RUNTIME = 4, STRUCT_GENERATED = 8, - STRUCT_FREE_POINTERS = 16 + STRUCT_FREE_POINTERS = 16, + STRUCT_NO_IDPROPERTIES = 32, /* Menu's and Panels don't need properties */ } StructFlag; typedef int (*StructValidateFunc)(struct PointerRNA *ptr, void *data, int *have_function); diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 1506f55c3f4..06813761eba 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -179,7 +179,7 @@ StructRNA *rna_ID_refine(PointerRNA *ptr) return ID_code_to_RNA_type(GS(id->name)); } -IDProperty *rna_ID_idproperties(PointerRNA *ptr, int create) +IDProperty *rna_ID_idprops(PointerRNA *ptr, int create) { return IDP_GetProperties(ptr->data, create); } @@ -198,7 +198,7 @@ void rna_ID_fake_user_set(PointerRNA *ptr, int value) } } -IDProperty *rna_IDPropertyGroup_idproperties(PointerRNA *ptr, int create) +IDProperty *rna_IDPropertyGroup_idprops(PointerRNA *ptr, int create) { return ptr->data; } @@ -320,7 +320,7 @@ static void rna_def_ID_properties(BlenderRNA *brna) * care of the properties here */ srna= RNA_def_struct(brna, "IDPropertyGroup", NULL); RNA_def_struct_ui_text(srna, "ID Property Group", "Group of ID properties"); - RNA_def_struct_idproperties_func(srna, "rna_IDPropertyGroup_idproperties"); + RNA_def_struct_idprops_func(srna, "rna_IDPropertyGroup_idprops"); RNA_def_struct_register_funcs(srna, "rna_IDPropertyGroup_register", "rna_IDPropertyGroup_unregister"); RNA_def_struct_refine_func(srna, "rna_IDPropertyGroup_refine"); @@ -344,7 +344,7 @@ static void rna_def_ID(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "ID", "Base type for datablocks, defining a unique name, linking from other libraries and garbage collection"); RNA_def_struct_flag(srna, STRUCT_ID|STRUCT_ID_REFCOUNT); RNA_def_struct_refine_func(srna, "rna_ID_refine"); - RNA_def_struct_idproperties_func(srna, "rna_ID_idproperties"); + RNA_def_struct_idprops_func(srna, "rna_ID_idprops"); prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_ui_text(prop, "Name", "Unique datablock ID name"); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 050f00b6a38..73af75ca960 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -241,7 +241,7 @@ IDProperty *rna_idproperty_ui(PropertyRNA *prop) return NULL; } -IDProperty *RNA_struct_idproperties(PointerRNA *ptr, int create) +IDProperty *RNA_struct_idprops(PointerRNA *ptr, int create) { StructRNA *type= ptr->type; @@ -251,14 +251,14 @@ IDProperty *RNA_struct_idproperties(PointerRNA *ptr, int create) return NULL; } -int RNA_struct_idproperties_check(StructRNA *srna) +int RNA_struct_idprops_check(StructRNA *srna) { return (srna && srna->idproperties) ? 1 : 0; } static IDProperty *rna_idproperty_find(PointerRNA *ptr, const char *name) { - IDProperty *group= RNA_struct_idproperties(ptr, 0); + IDProperty *group= RNA_struct_idprops(ptr, 0); if(group) return IDP_GetPropertyFromGroup(group, name); @@ -387,7 +387,7 @@ IDProperty *rna_idproperty_check(PropertyRNA **prop, PointerRNA *ptr) IDProperty *idprop= rna_idproperty_find(ptr, (*prop)->identifier); if(idprop && !rna_idproperty_verify_valid(ptr, *prop, idprop)) { - IDProperty *group= RNA_struct_idproperties(ptr, 0); + IDProperty *group= RNA_struct_idprops(ptr, 0); IDP_RemFromGroup(group, idprop); IDP_FreeProperty(idprop); @@ -510,6 +510,11 @@ int RNA_struct_is_ID(StructRNA *type) return (type->flag & STRUCT_ID) != 0; } +int RNA_struct_idprops_register_check(StructRNA *type) +{ + return (type->flag & STRUCT_NO_IDPROPERTIES) == 0; +} + int RNA_struct_is_a(StructRNA *type, StructRNA *srna) { StructRNA *base; @@ -1305,7 +1310,7 @@ void RNA_property_boolean_set(PointerRNA *ptr, PropertyRNA *prop, int value) val.i= value; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) IDP_AddToGroup(group, IDP_New(IDP_INT, val, (char*)prop->identifier)); } @@ -1375,7 +1380,7 @@ void RNA_property_boolean_set_array(PointerRNA *ptr, PropertyRNA *prop, const in val.array.len= prop->totarraylength; val.array.type= IDP_INT; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) { idprop= IDP_New(IDP_ARRAY, val, (char*)prop->identifier); IDP_AddToGroup(group, idprop); @@ -1472,7 +1477,7 @@ void RNA_property_int_set(PointerRNA *ptr, PropertyRNA *prop, int value) val.i= value; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) IDP_AddToGroup(group, IDP_New(IDP_INT, val, (char*)prop->identifier)); } @@ -1542,7 +1547,7 @@ void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *v val.array.len= prop->totarraylength; val.array.type= IDP_INT; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) { idprop= IDP_New(IDP_ARRAY, val, (char*)prop->identifier); IDP_AddToGroup(group, idprop); @@ -1648,7 +1653,7 @@ void RNA_property_float_set(PointerRNA *ptr, PropertyRNA *prop, float value) val.f= value; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) IDP_AddToGroup(group, IDP_New(IDP_FLOAT, val, (char*)prop->identifier)); } @@ -1736,7 +1741,7 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa val.array.len= prop->totarraylength; val.array.type= IDP_FLOAT; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) { idprop= IDP_New(IDP_ARRAY, val, (char*)prop->identifier); IDP_AddToGroup(group, idprop); @@ -1861,7 +1866,7 @@ void RNA_property_string_set(PointerRNA *ptr, PropertyRNA *prop, const char *val else if(prop->flag & PROP_EDITABLE) { IDProperty *group; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) IDP_AddToGroup(group, IDP_NewString((char*)value, (char*)prop->identifier, RNA_property_string_maxlength(prop) - 1)); } @@ -1926,7 +1931,7 @@ void RNA_property_enum_set(PointerRNA *ptr, PropertyRNA *prop, int value) val.i= value; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) IDP_AddToGroup(group, IDP_New(IDP_INT, val, (char*)prop->identifier)); } @@ -1999,7 +2004,7 @@ void RNA_property_pointer_add(PointerRNA *ptr, PropertyRNA *prop) val.i= 0; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) IDP_AddToGroup(group, IDP_New(IDP_GROUP, val, (char*)prop->identifier)); } @@ -2012,7 +2017,7 @@ void RNA_property_pointer_remove(PointerRNA *ptr, PropertyRNA *prop) IDProperty *idprop, *group; if((idprop=rna_idproperty_check(&prop, ptr))) { - group= RNA_struct_idproperties(ptr, 0); + group= RNA_struct_idprops(ptr, 0); if(group) { IDP_RemFromGroup(group, idprop); @@ -2125,7 +2130,7 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA IDProperty *group, *item; IDPropertyTemplate val = {0}; - group= RNA_struct_idproperties(ptr, 1); + group= RNA_struct_idprops(ptr, 1); if(group) { idprop= IDP_NewIDPArray(prop->identifier); IDP_AddToGroup(group, idprop); @@ -2965,7 +2970,7 @@ int RNA_path_resolve_full(PointerRNA *ptr, const char *path, PointerRNA *r_ptr, return 0; if(use_id_prop) { /* look up property name in current struct */ - IDProperty *group= RNA_struct_idproperties(&curptr, 0); + IDProperty *group= RNA_struct_idprops(&curptr, 0); if(group && rna_token_strip_quotes(token)) prop= (PropertyRNA *)IDP_GetPropertyFromGroup(group, token+1); } 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 3217e73e3fb..8b21fd2c80a 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -123,7 +123,7 @@ static char *rna_Bone_path(PointerRNA *ptr) return BLI_sprintfN("bones[\"%s\"]", ((Bone*)ptr->data)->name); } -static IDProperty *rna_Bone_idproperties(PointerRNA *ptr, int create) +static IDProperty *rna_Bone_idprops(PointerRNA *ptr, int create) { Bone *bone= ptr->data; @@ -135,7 +135,7 @@ static IDProperty *rna_Bone_idproperties(PointerRNA *ptr, int create) return bone->prop; } -static IDProperty *rna_EditBone_idproperties(PointerRNA *ptr, int create) +static IDProperty *rna_EditBone_idprops(PointerRNA *ptr, int create) { EditBone *ebone= ptr->data; @@ -504,7 +504,7 @@ static void rna_def_bone(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Bone", "Bone in an Armature datablock"); RNA_def_struct_ui_icon(srna, ICON_BONE_DATA); RNA_def_struct_path_func(srna, "rna_Bone_path"); - RNA_def_struct_idproperties_func(srna, "rna_Bone_idproperties"); + RNA_def_struct_idprops_func(srna, "rna_Bone_idprops"); /* pointers/collections */ /* parent (pointer) */ @@ -572,7 +572,7 @@ static void rna_def_edit_bone(BlenderRNA *brna) srna= RNA_def_struct(brna, "EditBone", NULL); RNA_def_struct_sdna(srna, "EditBone"); - RNA_def_struct_idproperties_func(srna, "rna_EditBone_idproperties"); + RNA_def_struct_idprops_func(srna, "rna_EditBone_idprops"); RNA_def_struct_ui_text(srna, "Edit Bone", "Editmode bone in an Armature datablock"); RNA_def_struct_ui_icon(srna, ICON_BONE_DATA); @@ -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_boid.c b/source/blender/makesrna/intern/rna_boid.c index 636d45730a7..3afa135d079 100644 --- a/source/blender/makesrna/intern/rna_boid.c +++ b/source/blender/makesrna/intern/rna_boid.c @@ -238,7 +238,7 @@ static void rna_def_boidrule_goal(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Object", "Goal object"); RNA_def_property_update(prop, 0, "rna_Boids_reset_deps"); - prop= RNA_def_property(srna, "predict", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_predict", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_GOAL_AVOID_PREDICT); RNA_def_property_ui_text(prop, "Predict", "Predict target movement"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -259,7 +259,7 @@ static void rna_def_boidrule_avoid(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Object", "Object to avoid"); RNA_def_property_update(prop, 0, "rna_Boids_reset_deps"); - prop= RNA_def_property(srna, "predict", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_predict", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_GOAL_AVOID_PREDICT); RNA_def_property_ui_text(prop, "Predict", "Predict target movement"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -278,12 +278,12 @@ static void rna_def_boidrule_avoid_collision(BlenderRNA *brna) srna= RNA_def_struct(brna, "BoidRuleAvoidCollision", "BoidRule"); RNA_def_struct_ui_text(srna, "Avoid Collision", ""); - prop= RNA_def_property(srna, "boids", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_avoid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_ACOLL_WITH_BOIDS); RNA_def_property_ui_text(prop, "Boids", "Avoid collision with other boids"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "deflectors", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_avoid_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_ACOLL_WITH_DEFLECTORS); RNA_def_property_ui_text(prop, "Deflectors", "Avoid collision with deflector objects"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -313,12 +313,13 @@ static void rna_def_boidrule_follow_leader(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Distance", "Distance behind leader to follow"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "queue_size", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "queue_count", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "queue_size"); RNA_def_property_range(prop, 0.0f, 100.0f); RNA_def_property_ui_text(prop, "Queue Size", "How many boids in a line"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "line", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_line", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BRULE_LEADER_IN_LINE); RNA_def_property_ui_text(prop, "Line", "Follow leader in a line"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -443,7 +444,8 @@ static void rna_def_boidstate(BlenderRNA *brna) RNA_def_property_int_funcs(prop, "rna_BoidState_active_boid_rule_index_get", "rna_BoidState_active_boid_rule_index_set", "rna_BoidState_active_boid_rule_index_range"); RNA_def_property_ui_text(prop, "Active Boid Rule Index", ""); - prop= RNA_def_property(srna, "rule_fuzziness", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "rule_fuzzy", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "rule_fuzziness"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Rule Fuzziness", ""); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -466,12 +468,14 @@ static void rna_def_boid_settings(BlenderRNA *brna) srna = RNA_def_struct(brna, "BoidSettings", NULL); RNA_def_struct_ui_text(srna, "Boid Settings", "Settings for boid physics"); - prop= RNA_def_property(srna, "landing_smoothness", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "land_smooth", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "landing_smoothness"); RNA_def_property_range(prop, 0.0, 10.0); RNA_def_property_ui_text(prop, "Landing Smoothness", "How smoothly the boids land"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "banking", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "bank", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "banking"); RNA_def_property_range(prop, 0.0, 2.0); RNA_def_property_ui_text(prop, "Banking", "Amount of rotation around velocity vector on turns"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -522,22 +526,26 @@ static void rna_def_boid_settings(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Boids_reset"); /* physical properties */ - prop= RNA_def_property(srna, "air_min_speed", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "air_speed_min", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "air_min_speed"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Min Air Speed", "Minimum speed in air (relative to maximum speed)"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "air_max_speed", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "air_speed_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "air_max_speed"); RNA_def_property_range(prop, 0.0, 100.0); RNA_def_property_ui_text(prop, "Max Air Speed", "Maximum speed in air"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "air_max_acc", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "air_acc_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "air_max_acc"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Max Air Acceleration", "Maximum acceleration in air (relative to maximum speed)"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "air_max_ave", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "air_ave_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "air_max_ave"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Max Air Angular Velocity", "Maximum angular velocity in air (relative to 180 degrees)"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -552,17 +560,20 @@ static void rna_def_boid_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Jump Speed", "Maximum speed for jumping"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "land_max_speed", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "land_speed_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "land_max_speed"); RNA_def_property_range(prop, 0.0, 100.0); RNA_def_property_ui_text(prop, "Max Land Speed", "Maximum speed on land"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "land_max_acc", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "land_acc_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "land_max_acc"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Max Land Acceleration", "Maximum acceleration on land (relative to maximum speed)"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "land_max_ave", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "land_ave_max", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "land_max_ave"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Max Land Angular Velocity", "Maximum angular velocity on land (relative to 180 degrees)"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); @@ -578,17 +589,17 @@ static void rna_def_boid_settings(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Boids_reset"); /* options */ - prop= RNA_def_property(srna, "allow_flight", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_flight", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BOID_ALLOW_FLIGHT); RNA_def_property_ui_text(prop, "Allow Flight", "Allow boids to move in air"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "allow_land", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_land", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BOID_ALLOW_LAND); RNA_def_property_ui_text(prop, "Allow Land", "Allow boids to move on land"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); - prop= RNA_def_property(srna, "allow_climb", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_climb", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "options", BOID_ALLOW_CLIMB); RNA_def_property_ui_text(prop, "Allow Climbing", "Allow boids to climb goal objects"); RNA_def_property_update(prop, 0, "rna_Boids_reset"); 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..a58807902d8 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"); @@ -638,19 +638,19 @@ static void rna_def_constraint_track_to(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Sub-Target", ""); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "track", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "track_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "reserved1"); RNA_def_property_enum_items(prop, track_items); RNA_def_property_ui_text(prop, "Track Axis", "Axis that points to the target object"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "up", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "up_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "reserved2"); RNA_def_property_enum_items(prop, up_items); 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"); @@ -832,7 +832,7 @@ static void rna_def_constraint_same_volume(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Maintain Volume Constraint", "Maintains a constant volume along a single scaling axis"); RNA_def_struct_sdna_from(srna, "bSameVolumeConstraint", "data"); - prop= RNA_def_property(srna, "axis", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "free_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, volume_items); RNA_def_property_ui_text(prop, "Free Axis", "The free scaling axis of the object"); @@ -906,7 +906,7 @@ static void rna_def_constraint_minmax(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Floor Location", "Location of target that object will not pass through"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "sticky", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_sticky", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MINMAX_STICKY); RNA_def_property_ui_text(prop, "Sticky", "Immobilize object while constrained"); 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"); @@ -1028,13 +1028,13 @@ static void rna_def_constraint_locked_track(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Sub-Target", ""); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "track", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "track_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "trackflag"); RNA_def_property_enum_items(prop, locktrack_items); RNA_def_property_ui_text(prop, "Track Axis", "Axis that points to the target object"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "lock", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "lock_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "lockflag"); RNA_def_property_enum_items(prop, lock_items); RNA_def_property_ui_text(prop, "Locked Axis", "Axis that points upward"); @@ -1083,13 +1083,13 @@ static void rna_def_constraint_follow_path(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Offset Factor", "Percentage value defining target position along length of bone"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "forward", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "forward_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "trackflag"); RNA_def_property_enum_items(prop, forwardpath_items); RNA_def_property_ui_text(prop, "Forward Axis", "Axis that points forward along the path"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "up", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "up_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "upflag"); RNA_def_property_enum_items(prop, pathup_items); RNA_def_property_ui_text(prop, "Up Axis", "Axis that points upward"); @@ -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"); @@ -1286,7 +1286,7 @@ static void rna_def_constraint_clamp_to(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Main Axis", "Main axis of movement"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "cyclic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", CLAMPTO_CYCLIC); RNA_def_property_ui_text(prop, "Cyclic", "Treat curve as cyclic curve (no clamping to curve bounding box"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); @@ -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"); @@ -1772,7 +1772,7 @@ static void rna_def_constraint_damped_track(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Sub-Target", ""); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "track", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "track_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "trackflag"); RNA_def_property_enum_items(prop, damptrack_items); RNA_def_property_ui_text(prop, "Track Axis", "Axis that points to the target object"); @@ -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"); @@ -1950,9 +1950,9 @@ void RNA_def_constraint(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1); // XXX this is really an internal flag, but it may be useful for some tools to be able to access this... - prop= RNA_def_property(srna, "disabled", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_valid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_DISABLE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_DISABLE); RNA_def_property_ui_text(prop, "Disabled", "Constraint has invalid settings and will not be evaluated"); // TODO: setting this to true must ensure that all others in stack are turned off too... @@ -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 b26c12bed09..423e5e4d203 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -679,7 +679,7 @@ static void rna_def_path(BlenderRNA *brna, StructRNA *srna) PropertyRNA *prop; /* number values */ - prop= RNA_def_property(srna, "path_length", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "path_duration", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "pathlen"); RNA_def_property_range(prop, 1, MAXFRAME); RNA_def_property_ui_text(prop, "Path Length", "The number of frames that are needed to traverse the path, defining the maximum value for the 'Evaluation Time' setting"); @@ -722,7 +722,7 @@ static void rna_def_nurbs(BlenderRNA *brna, StructRNA *srna) PropertyRNA *prop; /* flags */ - prop= RNA_def_property(srna, "map_along_length", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_on_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_UV_ORCO); RNA_def_property_ui_text(prop, "Map Along Length", "Generate texture mapping coordinates following the curve direction, rather than the local bounding box"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); @@ -741,13 +741,14 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna) {0, NULL, 0, NULL, NULL}}; /* Enums */ - prop= RNA_def_property(srna, "spacemode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "align", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "spacemode"); RNA_def_property_enum_items(prop, prop_align_items); RNA_def_property_ui_text(prop, "Text Align", "Text align from the object center"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* number values */ - prop= RNA_def_property(srna, "text_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "fsize"); RNA_def_property_range(prop, 0.0001f, 10000.0f); RNA_def_property_ui_range(prop, 0.01, 10, 1, 1); @@ -760,19 +761,19 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna) RNA_def_property_ui_text(prop, "Small Caps", "Scale of small capitals"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "line_dist", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "space_line", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "linedist"); RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_text(prop, "Distance between lines of text", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "word_spacing", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "space_word", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "wordspace"); RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_text(prop, "Spacing between words", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "spacing", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "space_character", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "spacing"); RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_ui_text(prop, "Global spacing between characters", ""); @@ -796,13 +797,13 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna) RNA_def_property_ui_text(prop, "Y Offset", "Vertical offset from the object origin"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "ul_position", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "underline_position", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ulpos"); RNA_def_property_range(prop, -0.2f, 0.8f); RNA_def_property_ui_text(prop, "Underline Position", "Vertical position of underline"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "ul_height", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "underline_height", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ulheight"); RNA_def_property_range(prop, -0.2f, 0.8f); RNA_def_property_ui_text(prop, "Underline Thickness", ""); @@ -856,7 +857,7 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna) RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* flags */ - prop= RNA_def_property(srna, "fast", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_fast_edit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_FAST); RNA_def_property_ui_text(prop, "Fast", "Don't fill polygons while editing"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); @@ -908,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"); @@ -1107,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"); @@ -1184,12 +1185,12 @@ static void rna_def_curve(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dimensions", "Select 2D or 3D curve type"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "front", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_fill_front", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_FRONT); RNA_def_property_ui_text(prop, "Front", "Draw filled front for extruded/beveled curves"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "back", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_fill_back", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_BACK); RNA_def_property_ui_text(prop, "Back", "Draw filled back for extruded/beveled curves"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); @@ -1207,17 +1208,17 @@ static void rna_def_curve(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Twist Smooth", "Smoothing iteration for tangents"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "use_deform_fill", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_fill_deform", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_DEFORM_FILL); RNA_def_property_ui_text(prop, "Fill deformed", "Fill curve after applying deformation"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* texture space */ - prop= RNA_def_property(srna, "auto_texspace", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", CU_AUTOSPACE); RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object"); - prop= RNA_def_property(srna, "texspace_loc", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location"); RNA_def_property_editable_func(prop, "rna_Curve_texspace_editable"); @@ -1238,7 +1239,7 @@ static void rna_def_curve(BlenderRNA *brna) RNA_def_property_editable_func(prop, texspace_editable); RNA_def_property_update(prop, 0, "rna_Curve_update_data");*/ - prop= RNA_def_property(srna, "map_along_length", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_map_on_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_UV_ORCO); RNA_def_property_ui_text(prop, "Map Along Length", "Generate texture mapping coordinates following the curve direction, rather than the local bounding box"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); @@ -1339,34 +1340,34 @@ static void rna_def_curve_nurb(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Resolution V", "Surface subdivisions per segment"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "cyclic_u", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cyclic_u", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flagu", CU_NURB_CYCLIC); RNA_def_property_ui_text(prop, "Cyclic U", "Make this curve or surface a closed loop in the U direction"); RNA_def_property_update(prop, 0, "rna_Nurb_update_handle_data"); /* only needed for cyclic_u because cyclic_v cant do bezier */ - prop= RNA_def_property(srna, "cyclic_v", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cyclic_v", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flagv", CU_NURB_CYCLIC); RNA_def_property_ui_text(prop, "Cyclic V", "Make this surface a closed loop in the V direction"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* Note, endpoint and bezier flags should never be on at the same time! */ - prop= RNA_def_property(srna, "endpoint_u", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_endpoint_u", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flagu", CU_NURB_ENDPOINT); RNA_def_property_ui_text(prop, "Endpoint U", "Make this nurbs curve or surface meet the endpoints in the U direction (Cyclic U must be disabled)"); RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_u"); - prop= RNA_def_property(srna, "endpoint_v", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_endpoint_v", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flagv", CU_NURB_ENDPOINT); RNA_def_property_ui_text(prop, "Endpoint V", "Make this nurbs surface meet the endpoints in the V direction (Cyclic V must be disabled)"); RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v"); - prop= RNA_def_property(srna, "bezier_u", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_bezier_u", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flagu", CU_NURB_BEZIER); RNA_def_property_ui_text(prop, "Bezier U", "Make this nurbs curve or surface act like a bezier spline in the U direction (Order U must be 3 or 4, Cyclic U must be disabled)"); RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_u"); - prop= RNA_def_property(srna, "bezier_v", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_bezier_v", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flagv", CU_NURB_BEZIER); RNA_def_property_ui_text(prop, "Bezier V", "Make this nurbs surface act like a bezier spline in the V direction (Order V must be 3 or 4, Cyclic V must be disabled)"); RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v"); diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 6080d02a1c7..43bf40d3965 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -781,10 +781,10 @@ void RNA_def_struct_refine_func(StructRNA *srna, const char *refine) if(refine) srna->refine= (StructRefineFunc)refine; } -void RNA_def_struct_idproperties_func(StructRNA *srna, const char *idproperties) +void RNA_def_struct_idprops_func(StructRNA *srna, const char *idproperties) { if(!DefRNA.preprocess) { - fprintf(stderr, "RNA_def_struct_idproperties_func: only during preprocessing.\n"); + fprintf(stderr, "RNA_def_struct_idprops_func: only during preprocessing.\n"); return; } diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 8410099979e..b37e5f91538 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -568,7 +568,7 @@ static void rna_def_fmodifier_generator(BlenderRNA *brna) RNA_def_struct_sdna_from(srna, "FMod_Generator", "data"); /* define common props */ - prop= RNA_def_property(srna, "additive", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_additive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_GENERATOR_ADDITIVE); RNA_def_property_ui_text(prop, "Additive", "Values generated by this modifier are applied on top of the existing values instead of overwriting them"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); @@ -633,7 +633,7 @@ static void rna_def_fmodifier_function_generator(BlenderRNA *brna) RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); /* flags */ - prop= RNA_def_property(srna, "additive", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_additive", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FCM_GENERATOR_ADDITIVE); RNA_def_property_ui_text(prop, "Additive", "Values generated by this modifier are applied on top of the existing values instead of overwriting them"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); @@ -701,12 +701,12 @@ static void rna_def_fmodifier_envelope(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Reference Value", "Value that envelope's influence is centered around / based on"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "default_minimum", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "default_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "min"); RNA_def_property_ui_text(prop, "Default Minimum", "Lower distance from Reference Value for 1:1 default influence"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "default_maximum", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "default_max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "max"); RNA_def_property_ui_text(prop, "Default Maximum", "Upper distance from Reference Value for 1:1 default influence"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); @@ -731,22 +731,26 @@ static void rna_def_fmodifier_cycles(BlenderRNA *brna) RNA_def_struct_sdna_from(srna, "FMod_Cycles", "data"); /* before */ - prop= RNA_def_property(srna, "before_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "mode_before", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "before_mode"); RNA_def_property_enum_items(prop, prop_type_items); RNA_def_property_ui_text(prop, "Before Mode", "Cycling mode to use before first keyframe"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "before_cycles", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "cycles_before", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "before_cycles"); RNA_def_property_ui_text(prop, "Before Cycles", "Maximum number of cycles to allow before first keyframe. (0 = infinite)"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); /* after */ - prop= RNA_def_property(srna, "after_mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "mode_after", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "after_mode"); RNA_def_property_enum_items(prop, prop_type_items); RNA_def_property_ui_text(prop, "After Mode", "Cycling mode to use after last keyframe"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "after_cycles", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "cycles_after", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "after_cycles"); RNA_def_property_ui_text(prop, "After Cycles", "Maximum number of cycles to allow after last keyframe. (0 = infinite)"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); } @@ -774,45 +778,45 @@ static void rna_def_fmodifier_limits(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Limits F-Modifier", "Limits the time/value ranges of the modified F-Curve"); RNA_def_struct_sdna_from(srna, "FMod_Limits", "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", FCM_LIMIT_XMIN); RNA_def_property_ui_text(prop, "Minimum X", "Use the minimum X value"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - 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", FCM_LIMIT_YMIN); RNA_def_property_ui_text(prop, "Minimum Y", "Use the minimum Y value"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - 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", FCM_LIMIT_XMAX); RNA_def_property_ui_text(prop, "Maximum X", "Use the maximum X value"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - 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", FCM_LIMIT_YMAX); RNA_def_property_ui_text(prop, "Maximum Y", "Use the maximum Y value"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - 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, "rect.xmin"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_minx_range"); RNA_def_property_ui_text(prop, "Minimum X", "Lowest X value to allow"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - 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, "rect.ymin"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_miny_range"); RNA_def_property_ui_text(prop, "Minimum Y", "Lowest Y value to allow"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - 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, "rect.xmax"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_maxx_range"); RNA_def_property_ui_text(prop, "Maximum X", "Highest X value to allow"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - 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, "rect.ymax"); RNA_def_property_float_funcs(prop, NULL, NULL, "rna_FModifierLimits_maxy_range"); RNA_def_property_ui_text(prop, "Maximum Y", "Highest Y value to allow"); @@ -877,11 +881,12 @@ static void rna_def_fmodifier_stepped(BlenderRNA *brna) RNA_def_struct_sdna_from(srna, "FMod_Stepped", "data"); /* properties */ - prop= RNA_def_property(srna, "step_size", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "frame_step", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "step_size"); RNA_def_property_ui_text(prop, "Step Size", "Number of frames to hold each value"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "frame_offset", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "offset"); RNA_def_property_ui_text(prop, "Offset", "Reference number of frames before frames get held. Use to get hold for '1-3' vs '5-7' holding patterns"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index c267da53016..68060e2cfe3 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -228,11 +228,11 @@ 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"); - prop= RNA_def_property(srna, "path", PROP_STRING, PROP_DIRPATH); + prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_DIRPATH); RNA_def_property_string_maxlength(prop, 240); RNA_def_property_string_sdna(prop, NULL, "surfdataPath"); RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store baked fluid simulation files in"); @@ -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"); @@ -469,7 +469,7 @@ static void rna_def_fluidsim_particle(BlenderRNA *brna) RNA_def_property_range(prop, 0.0, 2.0); RNA_def_property_ui_text(prop, "Alpha Influence", "Amount of particle alpha change, inverse of size influence: 0=off (all same alpha), 1=full. (large particles get lower alphas, smaller ones higher values)"); - prop= RNA_def_property(srna, "path", PROP_STRING, PROP_DIRPATH); + prop= RNA_def_property(srna, "filepath", PROP_STRING, PROP_DIRPATH); RNA_def_property_string_maxlength(prop, 240); RNA_def_property_string_sdna(prop, NULL, "surfdataPath"); RNA_def_property_ui_text(prop, "Path", "Directory (and/or filename prefix) to store and load particles from"); @@ -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..bd121724413 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -223,23 +223,25 @@ 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"); /* animation */ - prop= RNA_def_property(srna, "cyclic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "cycl", 0); RNA_def_property_ui_text(prop, "Cyclic", "Cycle the images in the movie"); RNA_def_property_update(prop, 0, "rna_ImageUser_update"); - prop= RNA_def_property(srna, "frames", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_duration", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "frames"); RNA_def_property_range(prop, 0, MAXFRAMEF); RNA_def_property_ui_text(prop, "Frames", "Sets the number of images of a movie to use"); RNA_def_property_update(prop, 0, "rna_ImageUser_update"); - prop= RNA_def_property(srna, "offset", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_offset", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "offset"); RNA_def_property_range(prop, -MAXFRAMEF, MAXFRAMEF); RNA_def_property_ui_text(prop, "Offset", "Offsets the number of the frame to use in the animation"); RNA_def_property_update(prop, 0, "rna_ImageUser_update"); @@ -339,7 +341,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,30 +384,30 @@ 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"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); - prop= RNA_def_property(srna, "tiles", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_tiles", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "tpageflag", IMA_TILES); RNA_def_property_ui_text(prop, "Tiles", "Use of tilemode for faces (default shift-LMB to pick the tile for selected faces)"); RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); @@ -422,12 +424,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_internal.h b/source/blender/makesrna/intern/rna_internal.h index 917025a7a89..ded184208fc 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -190,9 +190,9 @@ void rna_ID_name_get(struct PointerRNA *ptr, char *value); int rna_ID_name_length(struct PointerRNA *ptr); void rna_ID_name_set(struct PointerRNA *ptr, const char *value); struct StructRNA *rna_ID_refine(struct PointerRNA *ptr); -struct IDProperty *rna_ID_idproperties(struct PointerRNA *ptr, int create); +struct IDProperty *rna_ID_idprops(struct PointerRNA *ptr, int create); void rna_ID_fake_user_set(struct PointerRNA *ptr, int value); -struct IDProperty *rna_IDPropertyGroup_idproperties(struct PointerRNA *ptr, int create); +struct IDProperty *rna_IDPropertyGroup_idprops(struct PointerRNA *ptr, int create); void rna_IDPropertyGroup_unregister(const struct bContext *C, struct StructRNA *type); struct StructRNA *rna_IDPropertyGroup_register(const struct bContext *C, struct ReportList *reports, void *data, const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free); struct StructRNA* rna_IDPropertyGroup_refine(struct PointerRNA *ptr); diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 4e2504516ec..c6660450914 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"); @@ -362,22 +362,22 @@ static void rna_def_lamp(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Color", "Light color"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); - prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_own_layer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_LAYER); RNA_def_property_ui_text(prop, "Layer", "Illuminates objects only on the same layer the lamp is on"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "negative", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_negative", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_NEG); RNA_def_property_ui_text(prop, "Negative", "Lamp casts negative light"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "specular", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", LA_NO_SPEC); RNA_def_property_ui_text(prop, "Specular", "Lamp creates specular highlights"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "diffuse", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", LA_NO_DIFF); RNA_def_property_ui_text(prop, "Diffuse", "Lamp does diffuse shading"); 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,17 +541,17 @@ 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"); - prop= RNA_def_property(srna, "dither", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_dither", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ray_samp_type", LA_SAMP_DITHER); RNA_def_property_ui_text(prop, "Dither", "Use 2x2 dithering for sampling (Constant Jittered sampling)"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); - prop= RNA_def_property(srna, "jitter", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_jitter", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "ray_samp_type", LA_SAMP_JITTER); RNA_def_property_ui_text(prop, "Jitter", "Use noise for sampling (Constant Jittered sampling)"); RNA_def_property_update(prop, 0, "rna_Lamp_update"); @@ -613,12 +613,12 @@ static void rna_def_spot_lamp(BlenderRNA *brna) rna_def_lamp_falloff(srna); rna_def_lamp_shadow(srna, 1, 0); - prop= RNA_def_property(srna, "square", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_square", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_SQUARE); RNA_def_property_ui_text(prop, "Square", "Casts a square spot light shape"); RNA_def_property_update(prop, 0, "rna_Lamp_draw_update"); - prop= RNA_def_property(srna, "halo", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_halo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", LA_HALO); RNA_def_property_ui_text(prop, "Halo", "Renders spotlight with a volumetric halo (Buffer Shadows)"); 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 b450a399c7d..46a89ccce40 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_diffuse", 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"); @@ -620,9 +620,9 @@ static void rna_def_material_mtex(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Enabled", "Enable this material texture slot"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "new_bump", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_NEW_BUMP); - RNA_def_property_ui_text(prop, "New Bump", "Use new, corrected bump mapping code (backwards compatibility option)"); + prop= RNA_def_property(srna, "use_old_bump", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "texflag", MTEX_NEW_BUMP); + RNA_def_property_ui_text(prop, "Old Bump", "Use old bump mapping (backwards compatibility option)"); RNA_def_property_update(prop, 0, "rna_Material_update"); } @@ -947,7 +947,7 @@ static void rna_def_material_raytra(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Filter", "Amount to blend in the material's diffuse color in raytraced transparency (simulating absorption)"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "limit", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "depth_max", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "tx_limit"); RNA_def_property_range(prop, 0.0f, 100.0f); RNA_def_property_ui_text(prop, "Limit", "Maximum depth for light to travel through the transparent material before becoming fully filtered (0.0 is disabled)"); @@ -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,48 +1185,48 @@ 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"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "ring", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_ring", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_RINGS); RNA_def_property_ui_text(prop, "Rings", "Renders rings over halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "lines", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_lines", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_LINES); RNA_def_property_ui_text(prop, "Lines", "Renders star shaped lines over halo"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "star", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_star", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_STAR); RNA_def_property_ui_text(prop, "Star", "Renders halo as a star"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "texture", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALOTEX); 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"); - prop= RNA_def_property(srna, "show_shaded", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shaded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_SHADE); RNA_def_property_ui_text(prop, "Shaded", "Lets halo receive light and shadows from external objects"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "soft", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_soft", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_HALO_SOFT); RNA_def_property_ui_text(prop, "Soft", "Softens the edges of halos at intersections with other geometry"); 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"); @@ -1465,7 +1465,7 @@ static void rna_def_material_physics(BlenderRNA *brna) RNA_def_property_range(prop, 0, 20); RNA_def_property_ui_text(prop, "Distance", "Distance of the physics area"); - prop= RNA_def_property(srna, "damp", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "damping", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "xyfrict"); RNA_def_property_range(prop, 0, 1); RNA_def_property_ui_text(prop, "Damping", "Damping of the spring force, 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"); @@ -1543,12 +1543,12 @@ void RNA_def_material(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Translucency", "Amount of diffuse shading on the back side"); RNA_def_property_update(prop, 0, "rna_Material_update"); - prop= RNA_def_property(srna, "cubic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cubic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shade_flag", MA_CUBIC); 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,32 +1578,32 @@ 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"); - prop= RNA_def_property(srna, "shadows", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_SHADOW); 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,57 +1623,57 @@ 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"); - prop= RNA_def_property(srna, "exclude_mist", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_NOMIST); - RNA_def_property_ui_text(prop, "Exclude Mist", "Excludes this material from mist effects (in world settings)"); + prop= RNA_def_property(srna, "use_mist", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", MA_NOMIST); + 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 358392f5a63..3dc7b8922e7 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"); @@ -1321,67 +1321,68 @@ static void rna_def_mtface(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Image", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "tex", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_image", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TEX); RNA_def_property_ui_text(prop, "Tex", "Render face with texture"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "light", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_LIGHT); RNA_def_property_ui_text(prop, "Light", "Use light for face"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "invisible", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_INVISIBLE); RNA_def_property_ui_text(prop, "Invisible", "Make face invisible"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_DYNAMIC); RNA_def_property_ui_text(prop, "Collision", "Use face for collision and ray-sensor detection"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "shared", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_blend_shared", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHAREDCOL); RNA_def_property_ui_text(prop, "Shared", "Blend vertex colors across face when vertices are shared"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "twoside", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_twoside", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TWOSIDE); RNA_def_property_ui_text(prop, "Two-side", "Render face two-sided"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - 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, "mode", TF_OBCOL); RNA_def_property_ui_text(prop, "Object Color", "Use ObColor instead of vertex colors"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "halo", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_halo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD); RNA_def_property_ui_text(prop, "Halo", "Screen aligned billboard"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "billboard", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_billboard", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD2); RNA_def_property_ui_text(prop, "Billboard", "Billboard with Z-axis constraint"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "shadow", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shadow_cast", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHADOW); RNA_def_property_ui_text(prop, "Shadow", "Face is used for shadow"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "text", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_bitmap_text", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BMFONT); RNA_def_property_ui_text(prop, "Text", "Enable bitmap text on face"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "alpha_sort", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_alpha_sort", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_ALPHASORT); RNA_def_property_ui_text(prop, "Alpha Sort", "Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible)"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "transp", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "transp"); RNA_def_property_enum_items(prop, transp_items); RNA_def_property_ui_text(prop, "Transparency", "Transparency blending mode"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); @@ -1392,7 +1393,7 @@ static void rna_def_mtface(BlenderRNA *brna) RNA_def_property_ui_text(prop, "UV Selected", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); - prop= RNA_def_property(srna, "uv_pinned", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "pin_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "unwrap", TF_PIN1); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "UV Pinned", ""); @@ -1742,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"); @@ -1766,11 +1767,11 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Shape Keys", ""); /* texture space */ - prop= RNA_def_property(srna, "auto_texspace", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE); RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object"); - prop= RNA_def_property(srna, "texspace_loc", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location"); RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index 5082b687b4d..0de8455bdb7 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -208,13 +208,13 @@ static void rna_def_metaball(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); /* number values */ - prop= RNA_def_property(srna, "wire_size", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "resolution", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "wiresize"); RNA_def_property_range(prop, 0.050f, 1.0f); RNA_def_property_ui_text(prop, "Wire Size", "Polygonization resolution in the 3D viewport"); RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); - prop= RNA_def_property(srna, "render_size", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "render_resolution", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "rendersize"); RNA_def_property_range(prop, 0.050f, 1.0f); RNA_def_property_ui_text(prop, "Render Size", "Polygonization resolution in rendering"); @@ -227,11 +227,11 @@ static void rna_def_metaball(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); /* texture space */ - prop= RNA_def_property(srna, "auto_texspace", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MB_AUTOSPACE); RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object"); - prop= RNA_def_property(srna, "texspace_loc", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location"); RNA_def_property_editable_func(prop, "rna_Meta_texspace_editable"); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 00eb39d940b..e1be99d48e7 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"); @@ -632,7 +632,7 @@ static void rna_def_modifier_multires(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Total Levels", "Number of subdivisions for which displacements are stored"); - prop= RNA_def_property(srna, "external", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_external", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_boolean_funcs(prop, "rna_MultiresModifier_external_get", NULL); RNA_def_property_ui_text(prop, "External", "Store multires displacements outside the .blend file, to save memory"); @@ -725,12 +725,14 @@ static void rna_def_modifier_build(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Start", "Specify the start frame of the effect"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "length", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "frame_duration", PROP_FLOAT, PROP_TIME); + RNA_def_property_float_sdna(prop, NULL, "length"); RNA_def_property_range(prop, 1, MAXFRAMEF); RNA_def_property_ui_text(prop, "Length", "Specify the total time the build effect requires"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "randomize", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_random_order", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "randomize", 1); RNA_def_property_ui_text(prop, "Randomize", "Randomize the faces or edges during build"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -750,42 +752,42 @@ static void rna_def_modifier_mirror(BlenderRNA *brna) RNA_def_struct_sdna(srna, "MirrorModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_MIRROR); - prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_X); RNA_def_property_ui_text(prop, "X", "Enable X axis mirror"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_Y); RNA_def_property_ui_text(prop, "Y", "Enable Y axis mirror"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_AXIS_Z); RNA_def_property_ui_text(prop, "Z", "Enable Z axis mirror"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "clip", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_clip", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_CLIPPING); 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); @@ -838,37 +840,37 @@ static void rna_def_modifier_wave(BlenderRNA *brna) RNA_def_struct_sdna(srna, "WaveModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_WAVE); - prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_X); RNA_def_property_ui_text(prop, "X", "X axis motion"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_Y); RNA_def_property_ui_text(prop, "Y", "Y axis motion"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "cyclic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_CYCL); RNA_def_property_ui_text(prop, "Cyclic", "Cyclic wave effect"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "normals", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WAVE_NORM); 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 +882,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 +931,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"); @@ -994,7 +997,7 @@ static void rna_def_modifier_armature(BlenderRNA *brna) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_ArmatureModifier_vgroup_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "deformflag", ARM_DEF_INVERT_VGROUP); RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1009,12 +1012,12 @@ static void rna_def_modifier_armature(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Bone Envelopes", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "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, "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"); @@ -1137,7 +1140,8 @@ static void rna_def_modifier_array(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Count", "Number of duplicates to make"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "length", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "fit_length", PROP_FLOAT, PROP_DISTANCE); + RNA_def_property_float_sdna(prop, NULL, "length"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_ui_range(prop, 0, 10000, 10, 2); RNA_def_property_ui_text(prop, "Length", "Length to fit array within"); @@ -1151,38 +1155,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 +1194,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 +1241,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 +1283,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 +1301,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 +1336,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 +1381,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"); @@ -1401,17 +1407,17 @@ static void rna_def_modifier_smooth(BlenderRNA *brna) RNA_def_struct_sdna(srna, "SmoothModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH); - prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_X); RNA_def_property_ui_text(prop, "X", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Y); RNA_def_property_ui_text(prop, "Y", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Z); RNA_def_property_ui_text(prop, "Z", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1423,7 +1429,8 @@ static void rna_def_modifier_smooth(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Factor", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "repeat", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "repeat"); RNA_def_property_ui_range(prop, 0, 30, 1, 0); RNA_def_property_ui_text(prop, "Repeat", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1463,22 +1470,22 @@ static void rna_def_modifier_cast(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, "x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_X); RNA_def_property_ui_text(prop, "X", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_Y); RNA_def_property_ui_text(prop, "Y", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_CAST_Z); 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"); @@ -1541,7 +1548,7 @@ static void rna_def_modifier_meshdeform(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Bound", "Whether geometry has been bound to control cage"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MDEF_INVERT_VGROUP); RNA_def_property_ui_text(prop, "Invert", "Invert vertex group influence"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1558,7 +1565,7 @@ static void rna_def_modifier_meshdeform(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Precision", "The grid size for binding"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "dynamic", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_dynamic_bind", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MDEF_DYNAMIC_BIND); RNA_def_property_ui_text(prop, "Dynamic", "Recompute binding dynamically on top of other deformers (slower and more memory consuming.)"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1610,7 +1617,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", ""); @@ -1622,12 +1629,12 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Axis", "Pole axis for rotation"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Parents); RNA_def_property_ui_text(prop, "Normal", "Create instances from normal particles"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "children", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_children", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Children); RNA_def_property_ui_text(prop, "Children", "Create instances from child particles"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1652,12 +1659,12 @@ 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"); - prop= RNA_def_property(srna, "size", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_size", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_UseSize); RNA_def_property_ui_text(prop, "Size", "Use particle size to scale the instances"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1694,7 +1701,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"); @@ -1714,7 +1721,7 @@ static void rna_def_modifier_explode(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dead", "Show mesh when particles are dead"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "size", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_size", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", eExplodeFlag_PaSize); RNA_def_property_ui_text(prop, "Size", "Use particle size for the shrapnel"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1827,7 +1834,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"); @@ -1844,7 +1851,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Edge Weight Method", "What edge weight to use for weighting a vertex"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "angle_limit", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "bevel_angle"); RNA_def_property_range(prop, 0, 180); RNA_def_property_ui_range(prop, 0, 180, 100, 2); @@ -1868,7 +1875,7 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) RNA_def_struct_sdna(srna, "ShrinkwrapModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_SHRINKWRAP); - prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "wrap_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "shrinkType"); RNA_def_property_enum_items(prop, shrink_type_items); RNA_def_property_ui_text(prop, "Mode", ""); @@ -1900,17 +1907,17 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Offset", "Distance to keep from the target"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_project_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS); RNA_def_property_ui_text(prop, "X", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_project_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS); RNA_def_property_ui_text(prop, "Y", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_project_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "projAxis", MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS); RNA_def_property_ui_text(prop, "Z", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -1922,27 +1929,27 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Subsurf Levels", "Number of subdivisions that must be performed before extracting vertices' positions and normals"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "negative", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_negative_direction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR); RNA_def_property_ui_text(prop, "Negative", "Allow vertices to move in the negative direction of axis"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "positive", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_positive_direction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "shrinkOpts", MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR); 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"); @@ -1997,7 +2004,7 @@ static void rna_def_modifier_mask(BlenderRNA *brna) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_MaskModifier_vgroup_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MASK_INV); RNA_def_property_ui_text(prop, "Invert", "Use vertices that are not part of region defined"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2020,7 +2027,8 @@ static void rna_def_modifier_simpledeform(BlenderRNA *brna) RNA_def_struct_sdna(srna, "SimpleDeformModifierData"); RNA_def_struct_ui_icon(srna, ICON_MOD_SIMPLEDEFORM); - prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "deform_method", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, simple_deform_mode_items); RNA_def_property_ui_text(prop, "Mode", ""); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2036,7 +2044,7 @@ static void rna_def_modifier_simpledeform(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, "relative", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "originOpts", MOD_SIMPLEDEFORM_ORIGIN_LOCAL); RNA_def_property_ui_text(prop, "Relative", "Sets the origin of deform space to be relative to the object"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2055,12 +2063,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"); @@ -2147,7 +2155,7 @@ static void rna_def_modifier_solidify(BlenderRNA *brna) RNA_def_property_ui_text(prop, "High Quality Normals", "Calculate normals which result in more even thickness (slow, disable when not needed)"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_vertex_group", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SOLIDIFY_VGROUP_INV); RNA_def_property_ui_text(prop, "Vertex Group Invert", "Invert the vertex group influence"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); @@ -2267,7 +2275,7 @@ void RNA_def_modifier(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 0); - prop= RNA_def_property(srna, "render", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Render); RNA_def_property_ui_text(prop, "Render", "Use modifier during rendering"); RNA_def_property_ui_icon(prop, ICON_SCENE, 0); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index ecd9736f4fd..15c8608e523 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? @@ -430,7 +430,7 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_MUTED); RNA_def_property_ui_text(prop, "Muted", "NLA Strip is not evaluated"); - prop= RNA_def_property(srna, "reversed", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_reverse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_REVERSE); RNA_def_property_ui_text(prop, "Reversed", "NLA Strip is played back in reverse order (only when timing is automatically determined)"); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index b3714c3d4ed..0fb79de8c65 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -656,12 +656,12 @@ static void def_time(StructRNA *srna) RNA_def_property_ui_text(prop, "Curve", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "start", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "custom1"); RNA_def_property_ui_text(prop, "Start Frame", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "end", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "custom2"); RNA_def_property_ui_text(prop, "End Frame", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -688,7 +688,7 @@ static void def_mix_rgb(StructRNA *srna) RNA_def_property_ui_text(prop, "Blend Type", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "alpha", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom2", 1); RNA_def_property_ui_text(prop, "Alpha", "Include alpha of second input in this operation"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -725,12 +725,12 @@ static void def_sh_material(StructRNA *srna) RNA_def_property_ui_text(prop, "Material", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "diffuse", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", SH_NODE_MAT_DIFF); RNA_def_property_ui_text(prop, "Diffuse", "Material Node outputs Diffuse"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "specular", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", SH_NODE_MAT_SPEC); RNA_def_property_ui_text(prop, "Specular", "Material Node outputs Specular"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -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"); @@ -833,19 +833,19 @@ static void def_cmp_hue_saturation(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeHueSat", "storage"); - prop = RNA_def_property(srna, "hue", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "color_hue", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "hue"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Hue", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "sat", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "color_saturation", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "sat"); RNA_def_property_range(prop, 0.0f, 2.0f); RNA_def_property_ui_text(prop, "Saturation", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "val", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "color_value", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "val"); RNA_def_property_range(prop, 0.0f, 2.0f); RNA_def_property_ui_text(prop, "Value", ""); @@ -869,19 +869,19 @@ 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", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "relative", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "relative", 1); RNA_def_property_ui_text(prop, "Relative", "Use relative (percent) values to define blur radius"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -910,12 +910,12 @@ static void def_cmp_blur(StructRNA *srna) RNA_def_property_ui_text(prop, "Filter Type", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "bokeh", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_bokeh", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "bokeh", 1); RNA_def_property_ui_text(prop, "Bokeh", "Uses circular filter (slower)"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "gamma", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_gamma_correction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gamma", 1); RNA_def_property_ui_text(prop, "Gamma", "Applies filter on gamma corrected values"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -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"); @@ -1008,7 +1008,7 @@ static void def_cmp_vector_blur(StructRNA *srna) RNA_def_property_ui_text(prop, "Blur Factor", "Scaling factor for motion vectors; actually 'shutter speed' in frames"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "curved", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_curved", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "curved", 1); RNA_def_property_ui_text(prop, "Curved", "Interpolate between frames in a bezier curve, rather than linearly"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1055,30 +1055,30 @@ static void def_cmp_image(StructRNA *srna) RNA_def_struct_sdna_from(srna, "ImageUser", "storage"); - prop = RNA_def_property(srna, "frames", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "frame_duration", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "frames"); RNA_def_property_range(prop, 1, MAXFRAMEF); RNA_def_property_ui_text(prop, "Frames", "Number of images used in animation"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "start", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "frame_start", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sfra"); RNA_def_property_range(prop, 1, MAXFRAMEF); RNA_def_property_ui_text(prop, "Start Frame", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "offset", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "frame_offset", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "offset"); RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF); RNA_def_property_ui_text(prop, "Offset", "Offsets the number of the frame to use in the animation"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "cyclic", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_cyclic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "cycl", 1); 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"); @@ -1219,7 +1219,7 @@ static void def_cmp_rotate(StructRNA *srna) {2, "BICUBIC", 0, "Bicubic", ""}, {0, NULL, 0, NULL, NULL}}; - prop = RNA_def_property(srna, "filter", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom1"); RNA_def_property_enum_items(prop, rotate_items); RNA_def_property_ui_text(prop, "Filter", "Method to use to filter rotation"); @@ -1253,19 +1253,19 @@ static void def_cmp_color_matte(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeChroma", "storage"); - prop = RNA_def_property(srna, "h", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "color_hue", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "t1"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "H", "Hue tolerance for colors to be considered a keying color"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "s", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "color_saturation", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "t2"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "S", "Saturation Tolerance for the color"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "v", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "color_value", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "t3"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "V", "Value Tolerance for the color"); @@ -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"); @@ -1370,14 +1370,14 @@ static void def_cmp_luma_matte(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeChroma", "storage"); - prop = RNA_def_property(srna, "high", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "limit_max", 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, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "High", "Values higher than this setting are 100% opaque"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "low", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "limit_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "t2"); RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t2_set", NULL); RNA_def_property_range(prop, 0.0f, 1.0f); @@ -1391,14 +1391,14 @@ 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); RNA_def_property_ui_text(prop, "Acceptance", "Tolerance for a color to be considered a keying color"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "cutoff", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "t2"); RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t2_set", NULL); RNA_def_property_range(prop, 0.0f, 30.0f); @@ -1446,7 +1446,7 @@ static void def_cmp_channel_matte(StructRNA *srna) RNA_def_property_ui_text(prop, "Color Space", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop= RNA_def_property(srna, "channel", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "matte_channel", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom2"); RNA_def_property_enum_items(prop, prop_tri_channel_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Node_channel_itemf"); @@ -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"); @@ -1468,14 +1468,14 @@ static void def_cmp_channel_matte(StructRNA *srna) RNA_def_property_ui_text(prop, "Limit Channel", "Limit by this channels value"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "high", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "limit_max", 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, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "High", "Values higher than this setting are 100% opaque"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "low", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "limit_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "t2"); RNA_def_property_float_funcs(prop, NULL, "rna_Matte_t2_set", NULL); RNA_def_property_range(prop, 0.0f, 1.0f); @@ -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"); @@ -1591,7 +1591,7 @@ static void def_cmp_defocus(StructRNA *srna) RNA_def_property_ui_text(prop, "Threshold", "CoC radius threshold, prevents background bleed on in-focus midground, 0=off"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "preview", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_preview", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "preview", 1); RNA_def_property_ui_text(prop, "Preview", "Enable sampling mode, useful for preview when using low samplecounts"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -1618,12 +1618,12 @@ static void def_cmp_invert(StructRNA *srna) { PropertyRNA *prop; - prop = RNA_def_property(srna, "rgb", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "invert_rgb", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_CHAN_RGB); RNA_def_property_ui_text(prop, "RGB", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "alpha", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "invert_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_CHAN_A); RNA_def_property_ui_text(prop, "Alpha", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -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", ""); @@ -1677,7 +1677,7 @@ static void def_cmp_dblur(StructRNA *srna) RNA_def_property_ui_text(prop, "Iterations", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "wrap", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_wrap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "wrap", 1); RNA_def_property_ui_text(prop, "Wrap", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); @@ -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,17 +1914,17 @@ 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"); - prop = RNA_def_property(srna, "jitter", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_jitter", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "jit", 1); RNA_def_property_ui_text(prop, "Jitter", "Enable/disable jittering; faster, but also noisier"); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - prop = RNA_def_property(srna, "fit", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_fit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "fit", 1); RNA_def_property_ui_text(prop, "Fit", "For positive distortion factor only: scale image such that black areas are not visible"); 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", ""); @@ -2017,7 +2017,7 @@ static void def_tex_output(StructRNA *srna) RNA_def_struct_sdna_from(srna, "TexNodeOutput", "storage"); - prop = RNA_def_property(srna, "output_name", PROP_STRING, PROP_NONE); + prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "name"); RNA_def_property_ui_text(prop, "Output Name", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index dad4468fb18..dc8cd2d7a03 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1246,40 +1246,40 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Rotation Damping", "General rotation damping"); - prop= RNA_def_property(srna, "minimum_velocity", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "velocity_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "min_vel"); RNA_def_property_range(prop, 0.0, 1000.0); RNA_def_property_ui_text(prop, "Velocity Min", "Clamp velocity to this minimum speed (except when totally still)"); - prop= RNA_def_property(srna, "maximum_velocity", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "velocity_max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "max_vel"); RNA_def_property_range(prop, 0.0, 1000.0); RNA_def_property_ui_text(prop, "Velocity Max", "Clamp velocity to this maximum speed"); /* lock position */ - prop= RNA_def_property(srna, "lock_x_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_location_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag2", OB_LOCK_RIGID_BODY_X_AXIS); RNA_def_property_ui_text(prop, "Lock X Axis", "Disable simulation of linear motion along the X axis"); - prop= RNA_def_property(srna, "lock_y_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_location_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag2", OB_LOCK_RIGID_BODY_Y_AXIS); RNA_def_property_ui_text(prop, "Lock Y Axis", "Disable simulation of linear motion along the Y axis"); - prop= RNA_def_property(srna, "lock_z_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_location_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag2", OB_LOCK_RIGID_BODY_Z_AXIS); RNA_def_property_ui_text(prop, "Lock Z Axis", "Disable simulation of linear motion along the Z axis"); /* lock rotation */ - prop= RNA_def_property(srna, "lock_x_rot_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_rotation_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag2", OB_LOCK_RIGID_BODY_X_ROT_AXIS); RNA_def_property_ui_text(prop, "Lock X Rotation Axis", "Disable simulation of angular motion along the X axis"); - prop= RNA_def_property(srna, "lock_y_rot_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_rotation_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag2", OB_LOCK_RIGID_BODY_Y_ROT_AXIS); RNA_def_property_ui_text(prop, "Lock Y Rotation Axis", "Disable simulation of angular motion along the Y axis"); - prop= RNA_def_property(srna, "lock_z_rot_axis", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock_rotation_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag2", OB_LOCK_RIGID_BODY_Z_ROT_AXIS); RNA_def_property_ui_text(prop, "Lock Z Rotation Axis", "Disable simulation of angular motion along the Z axis"); @@ -1289,11 +1289,11 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Lock Z Rotation Axis", "Disable simulation of angular motion along the Z axis"); - prop= RNA_def_property(srna, "material_physics", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_material_physics", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_DO_FH); RNA_def_property_ui_text(prop, "Use Material Physics", "Use physics settings in materials"); - prop= RNA_def_property(srna, "rotate_from_normal", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_rotate_from_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_ROT_FH); RNA_def_property_ui_text(prop, "Rotate From Normal", "Use face normal to rotate object, so that it points away from the surface"); @@ -1302,7 +1302,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Form Factor", "Form factor scales the inertia tensor"); - prop= RNA_def_property(srna, "anisotropic_friction", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_anisotropic_friction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_ANISOTROPIC_FRICTION); RNA_def_property_ui_text(prop, "Anisotropic Friction", "Enable anisotropic friction"); @@ -1315,14 +1315,14 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_BOUNDS); RNA_def_property_ui_text(prop, "Use Collision Bounds", "Specify a collision bounds type other than the default"); - prop= RNA_def_property(srna, "collision_bounds", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "collision_bounds_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "boundtype"); RNA_def_property_enum_items(prop, collision_bounds_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Object_collision_bounds_itemf"); RNA_def_property_ui_text(prop, "Collision Bounds", "Selects the collision type"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); - prop= RNA_def_property(srna, "collision_compound", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_collision_compound", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_CHILD); RNA_def_property_ui_text(prop, "Collision Compound", "Add children to form a compound collision object"); @@ -1337,7 +1337,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna) /* state */ - prop= RNA_def_property(srna, "visible_state", PROP_BOOLEAN, PROP_LAYER_MEMBER); + prop= RNA_def_property(srna, "states_visible", PROP_BOOLEAN, PROP_LAYER_MEMBER); RNA_def_property_boolean_sdna(prop, NULL, "state", 1); RNA_def_property_array(prop, OB_MAX_STATES); RNA_def_property_ui_text(prop, "State", "State determining which controllers are displayed"); @@ -1349,7 +1349,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_boolean_funcs(prop, "rna_GameObjectSettings_used_state_get", NULL); - prop= RNA_def_property(srna, "initial_state", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "states_initial", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "init_state", 1); RNA_def_property_array(prop, OB_MAX_STATES); RNA_def_property_ui_text(prop, "Initial State", "Initial state when the game starts"); @@ -1359,7 +1359,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Debug State", "Print state debug info in the game engine"); RNA_def_property_ui_icon(prop, ICON_INFO, 0); - prop= RNA_def_property(srna, "all_states", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_all_states", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scaflag", OB_ALLSTATE); RNA_def_property_ui_text(prop, "All", "Set all state bits"); @@ -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 cff274d81eb..1eadd0e7676 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -294,7 +294,7 @@ static void rna_Cache_active_point_cache_index_set(struct PointerRNA *ptr, int v BLI_freelistN(&pidlist); } -static void rna_PointCache_step_range(PointerRNA *ptr, int *min, int *max) +static void rna_PointCache_frame_step_range(PointerRNA *ptr, int *min, int *max) { Object *ob = ptr->id.data; PointCache *cache= ptr->data; @@ -714,9 +714,10 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_range(prop, 1, MAXFRAME); RNA_def_property_ui_text(prop, "End", "Frame on which the simulation stops"); - prop= RNA_def_property(srna, "step", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_step", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "step"); RNA_def_property_range(prop, 1, 20); - RNA_def_property_int_funcs(prop, NULL, NULL, "rna_PointCache_step_range"); + RNA_def_property_int_funcs(prop, NULL, NULL, "rna_PointCache_frame_step_range"); RNA_def_property_ui_text(prop, "Cache Step", "Number of frames between cached frames"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_change"); @@ -735,7 +736,7 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_BAKING); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - prop= RNA_def_property(srna, "disk_cache", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_disk_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_DISK_CACHE); RNA_def_property_ui_text(prop, "Disk Cache", "Save cache files to disk (.blend file must be saved first)"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_toggle_disk_cache"); @@ -760,7 +761,7 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_ui_text(prop, "File Path", "Cache file path"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); - prop= RNA_def_property(srna, "quick_cache", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_quick_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_QUICK_CACHE); RNA_def_property_ui_text(prop, "Quick Cache", "Update simulation with cache steps"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_change"); @@ -770,7 +771,7 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Cache Info", "Info on current cache status"); - prop= RNA_def_property(srna, "external", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_external", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_EXTERNAL); RNA_def_property_ui_text(prop, "External", "Read cache from an external location"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); @@ -814,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"); @@ -826,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"); @@ -838,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"); @@ -851,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"); @@ -895,7 +896,7 @@ static void rna_def_effector_weight(BlenderRNA *brna) RNA_def_struct_ui_icon(srna, ICON_PHYSICS); /* Flags */ - prop= RNA_def_property(srna, "do_growing_hair", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "apply_to_hair_growing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", EFF_WEIGHT_DO_HAIR); RNA_def_property_ui_text(prop, "Use For Growing Hair", "Use force fields when growing hair"); RNA_def_property_update(prop, 0, "rna_EffectorWeight_update"); @@ -949,7 +950,7 @@ static void rna_def_effector_weight(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Wind", "Wind effector weight"); RNA_def_property_update(prop, 0, "rna_EffectorWeight_update"); - prop= RNA_def_property(srna, "curveguide", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "curve_guide", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "weight[5]"); RNA_def_property_range(prop, -200.0f, 200.0f); RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3); @@ -1158,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"); @@ -1229,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"); @@ -1291,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"); @@ -1362,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"); @@ -1389,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"); @@ -1401,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"); } @@ -1529,7 +1530,7 @@ static void rna_def_softbody(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Push", "Edge spring stiffness when shorter than rest length"); RNA_def_property_update(prop, 0, "rna_softbody_update"); - prop= RNA_def_property(srna, "damp", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "damping", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "infrict"); RNA_def_property_range(prop, 0.0f, 50.0f); RNA_def_property_ui_text(prop, "Damp", "Edge spring friction"); @@ -1553,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"); @@ -1600,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"); @@ -1635,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 "); @@ -1649,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"); @@ -1680,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"); @@ -1702,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 3b3a537f69f..1151215f5f7 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -876,7 +876,7 @@ static void rna_def_particle(BlenderRNA *brna) // float fuv[4], foffset; /* coordinates on face/edge number "num" and depth along*/ // /* face normal for volume emission */ - prop= RNA_def_property(srna, "birthtime", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "birth_time", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, NULL, "time"); // RNA_def_property_range(prop, lowerLimitf, upperLimitf); RNA_def_property_ui_text(prop, "Birth Time", ""); @@ -902,7 +902,7 @@ static void rna_def_particle(BlenderRNA *brna) // int totkey; /* flag */ - prop= RNA_def_property(srna, "is_existing", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_exist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", PARS_UNEXIST); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Exists", ""); @@ -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,78 +1151,78 @@ 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"); - prop= RNA_def_property(srna, "trand", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_emit_random", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_TRAND); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); 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"); @@ -1294,7 +1294,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Particle_reset"); /*draw flag*/ - prop= RNA_def_property(srna, "velocity", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_velocity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_VEL); RNA_def_property_ui_text(prop, "Velocity", "Show particle velocity"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -1304,7 +1304,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Size", "Show particle size"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "emitter", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_render_emitter", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_EMITTER); RNA_def_property_ui_text(prop, "Emitter", "Render emitter Object also"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); @@ -1314,17 +1314,17 @@ 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"); - prop= RNA_def_property(srna, "parent", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_parent_particles", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_PARENT); RNA_def_property_ui_text(prop, "Parents", "Render parent particles"); 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,12 +1429,12 @@ 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"); - prop= RNA_def_property(srna, "display", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "draw_percentage", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "disp"); RNA_def_property_range(prop, 0, 100); RNA_def_property_ui_text(prop, "Display", "Percentage of particles to display in 3D view"); @@ -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,11 +1514,11 @@ 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"); - prop= RNA_def_property(srna, "viewport", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_simplify_viewport", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "simplify_flag", PART_SIMPLIFY_VIEWPORT); RNA_def_property_ui_text(prop, "Viewport", ""); @@ -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"); @@ -1593,7 +1593,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Stiffness", "Hair stiffness for effectors"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "amount", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "count", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "totpart"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); /* This limit is for those freaks who have the machine power to handle it. */ @@ -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"); @@ -2055,12 +2058,13 @@ static void rna_def_particle_target(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Duration", ""); RNA_def_property_update(prop, 0, "rna_Particle_target_redo"); - prop= RNA_def_property(srna, "valid", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_valid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTARGET_VALID); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Valid", "Keyed particles target is valid"); - prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "alliance", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, mode_items); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Mode", ""); @@ -2111,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"); @@ -2137,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"); @@ -2188,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"); @@ -2198,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"); @@ -2208,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"); @@ -2218,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"); @@ -2228,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"); @@ -2258,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"); @@ -2268,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"); @@ -2278,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"); @@ -2288,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"); @@ -2298,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 41adaa7047c..ce797f21494 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -120,7 +120,7 @@ static void rna_BoneGroup_color_set_set(PointerRNA *ptr, int value) } } -static IDProperty *rna_PoseBone_idproperties(PointerRNA *ptr, int create) +static IDProperty *rna_PoseBone_idprops(PointerRNA *ptr, int create) { bPoseChannel *pchan= ptr->data; @@ -685,7 +685,7 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_struct_sdna(srna, "bPoseChannel"); RNA_def_struct_ui_text(srna, "Pose Bone", "Channel defining pose data for a bone in a Pose"); RNA_def_struct_path_func(srna, "rna_PoseBone_path"); - RNA_def_struct_idproperties_func(srna, "rna_PoseBone_idproperties"); + RNA_def_struct_idprops_func(srna, "rna_PoseBone_idprops"); /* Bone Constraints */ prop= RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE); @@ -812,49 +812,49 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Has IK", "Is part of an IK chain"); RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update"); - prop= RNA_def_property(srna, "ik_dof_x", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_XDOF); - RNA_def_property_ui_text(prop, "IK X DoF", "Allow movement around the X axis"); + prop= RNA_def_property(srna, "lock_ik_x", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_NO_XDOF); + RNA_def_property_ui_text(prop, "IK X Lock", "Disallow 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_dof_y", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_YDOF); - RNA_def_property_ui_text(prop, "IK Y DoF", "Allow movement around the Y axis"); + prop= RNA_def_property(srna, "lock_ik_y", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_NO_YDOF); + RNA_def_property_ui_text(prop, "IK Y Lock", "Disallow 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_dof_z", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_ZDOF); - RNA_def_property_ui_text(prop, "IK Z DoF", "Allow movement around the Z axis"); + prop= RNA_def_property(srna, "lock_ik_z", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_NO_ZDOF); + RNA_def_property_ui_text(prop, "IK Z Lock", "Disallow 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_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_property.c b/source/blender/makesrna/intern/rna_property.c index 7bcb58ea28d..13f913b978b 100644 --- a/source/blender/makesrna/intern/rna_property.c +++ b/source/blender/makesrna/intern/rna_property.c @@ -121,7 +121,7 @@ void RNA_def_gameproperty(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, NULL, "rna_GameProperty_type_set", NULL); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "debug", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_debug", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PROP_DEBUG); RNA_def_property_ui_text(prop, "Debug", "Print debug information for this property"); RNA_def_property_update(prop, NC_LOGIC, NULL); diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 5c8de9c4587..4bfd0e4fd41 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -201,7 +201,7 @@ static void rna_Struct_properties_next(CollectionPropertyIterator *iter) /* try id properties */ if(!iter->valid) { - group= RNA_struct_idproperties(&iter->builtin_parent, 0); + group= RNA_struct_idprops(&iter->builtin_parent, 0); if(group) { rna_iterator_listbase_end(iter); @@ -335,7 +335,7 @@ PointerRNA rna_builtin_properties_lookup_string(PointerRNA *ptr, const char *key if(ptr->data) { IDProperty *group, *idp; - group= RNA_struct_idproperties(ptr, 0); + group= RNA_struct_idprops(ptr, 0); if(group) { for(idp=group->data.group.first; idp; idp=idp->next) { diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 1e7144ee982..7c57b0c742b 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1873,13 +1873,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"); @@ -1898,7 +1898,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"); @@ -1995,7 +1995,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"); @@ -2034,7 +2034,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"); @@ -2045,32 +2045,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"); @@ -2402,7 +2402,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 c9e07000f26..3b83ec2d3ad 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -202,22 +202,22 @@ static void rna_def_sculpt(BlenderRNA *brna) srna= RNA_def_struct(brna, "Sculpt", "Paint"); RNA_def_struct_ui_text(srna, "Sculpt", ""); - prop= RNA_def_property(srna, "radial_symm", PROP_INT, PROP_XYZ); + prop= RNA_def_property(srna, "radial_symmetry", PROP_INT, PROP_XYZ); RNA_def_property_int_sdna(prop, NULL, "radial_symm"); RNA_def_property_int_default(prop, 1); RNA_def_property_range(prop, 1, 64); RNA_def_property_ui_range(prop, 0, 32, 1, 1); RNA_def_property_ui_text(prop, "Radial Symmetry Count X Axis", "Number of times to copy strokes across the surface"); - prop= RNA_def_property(srna, "symmetry_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_symmetry_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMM_X); RNA_def_property_ui_text(prop, "Symmetry X", "Mirror brush across the X axis"); - prop= RNA_def_property(srna, "symmetry_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_symmetry_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMM_Y); RNA_def_property_ui_text(prop, "Symmetry Y", "Mirror brush across the Y axis"); - prop= RNA_def_property(srna, "symmetry_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_symmetry_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMM_Z); RNA_def_property_ui_text(prop, "Symmetry Z", "Mirror brush across the Z axis"); @@ -237,7 +237,7 @@ static void rna_def_sculpt(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMMETRY_FEATHER); RNA_def_property_ui_text(prop, "Symmetry Feathering", "Reduce the strength of the brush where it overlaps symmetrical daubs"); - prop= RNA_def_property(srna, "use_openmp", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_threaded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_USE_OPENMP); RNA_def_property_ui_text(prop, "Use OpenMP", "Take advantage of multiple CPU cores to improve sculpting performance"); } @@ -251,15 +251,15 @@ 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"); - - prop= RNA_def_property(srna, "normals", PROP_BOOLEAN, PROP_NONE); + + prop= RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE); 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"); } @@ -291,7 +291,7 @@ static void rna_def_image_paint(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_XRAY); RNA_def_property_ui_text(prop, "Occlude", "Only paint onto the faces directly under the brush (slower)"); - prop= RNA_def_property(srna, "use_backface_cull", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_backface_culling", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_BACKFACE); RNA_def_property_ui_text(prop, "Cull", "Ignore faces pointing away from the view (faster)"); @@ -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..d3207f14e24 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -671,22 +671,26 @@ static void rna_def_strip_crop(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Sequence Crop", "Cropping parameters for a sequence strip"); RNA_def_struct_sdna(srna, "StripCrop"); - prop= RNA_def_property(srna, "top", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "max_y", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "top"); RNA_def_property_ui_text(prop, "Top", ""); RNA_def_property_ui_range(prop, 0, 4096, 1, 0); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "bottom", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "min_x", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "bottom"); RNA_def_property_ui_text(prop, "Bottom", ""); RNA_def_property_ui_range(prop, 0, 4096, 1, 0); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "left", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "min_y", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "left"); RNA_def_property_ui_text(prop, "Left", ""); RNA_def_property_ui_range(prop, 0, 4096, 1, 0); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "right", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "max_x", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "right"); RNA_def_property_ui_text(prop, "Right", ""); RNA_def_property_ui_range(prop, 0, 4096, 1, 0); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); @@ -764,17 +768,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 +887,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 +956,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 +974,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 +1042,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 +1134,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 +1149,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 +1157,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 +1422,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 +1434,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 +1474,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 +1542,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 573f460e2bf..53f27bc06fb 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"); @@ -189,7 +189,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Fluid Group", "Limit fluid objects to this group"); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset_dependancy"); - prop= RNA_def_property(srna, "eff_group", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "effector_group", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "eff_group"); RNA_def_property_struct_type(prop, "Group"); RNA_def_property_flag(prop, PROP_EDITABLE); @@ -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); @@ -305,7 +305,7 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Particle Systems", "Particle systems emitted from the object"); RNA_def_property_update(prop, 0, "rna_Smoke_reset_dependancy"); - prop= RNA_def_property(srna, "outflow", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_outflow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "type", MOD_SMOKE_FLOW_TYPE_OUTFLOW); RNA_def_property_ui_text(prop, "Outflow", "Deletes smoke from simulation"); RNA_def_property_update(prop, 0, NULL); @@ -320,7 +320,7 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Initial Velocity", "Smoke inherits it's velocity from the emitter particle"); RNA_def_property_update(prop, 0, NULL); - prop= RNA_def_property(srna, "velocity_multiplier", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "velocity_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "vel_multi"); RNA_def_property_range(prop, -2.0, 2.0); RNA_def_property_ui_range(prop, -2.0, 2.0, 0.05, 5); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 25699c6992d..f74621e8419 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1184,7 +1184,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Box", "Sync view position between side views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, "rna_RegionView3D_quadview_update"); - prop= RNA_def_property(srna, "box_clip", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_box_clip", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "viewlock", RV3D_BOXCLIP); RNA_def_property_ui_text(prop, "Clip", "Clip objects based on what's visible in other side views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, "rna_RegionView3D_quadview_update"); diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c index 81256e7b87a..15e7ce525ba 100644 --- a/source/blender/makesrna/intern/rna_text.c +++ b/source/blender/makesrna/intern/rna_text.c @@ -139,11 +139,13 @@ static void rna_def_text_marker(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Line", "Line in which the marker is located"); - prop= RNA_def_property(srna, "start", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "character_index_start", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "start"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Start", "Start position of the marker in the line"); - prop= RNA_def_property(srna, "end", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "character_index_end", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "end"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "End", "Start position of the marker in the line"); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 284473e90a5..567166fd15f 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"); @@ -464,7 +464,8 @@ static void rna_def_mtex(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Offset", "Fine tunes texture mapping X, Y and Z locations"); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); - prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_XYZ); + prop= RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ); + RNA_def_property_float_sdna(prop, NULL, "size"); RNA_def_property_ui_range(prop, -100, 100, 10, 2); RNA_def_property_ui_text(prop, "Size", "Sets scaling for the texture's X, Y and Z sizes"); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); @@ -481,17 +482,17 @@ 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"); - prop= RNA_def_property(srna, "negate", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_NEGATIVE); 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"); @@ -514,18 +515,18 @@ static void rna_def_filter_common(StructRNA *srna) { PropertyRNA *prop; - prop= RNA_def_property(srna, "mipmap", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_mipmap", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_MIPMAP); RNA_def_property_boolean_funcs(prop, NULL, "rna_ImageTexture_mipmap_set"); 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"); - prop= RNA_def_property(srna, "filter", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texfilter"); RNA_def_property_enum_items(prop, texture_filter_items); RNA_def_property_ui_text(prop, "Filter", "Texture filter to use for sampling image"); @@ -543,7 +544,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"); @@ -615,7 +616,7 @@ static void rna_def_environment_map(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Zoom", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "ignore_layers", PROP_BOOLEAN, PROP_LAYER_MEMBER); + prop= RNA_def_property(srna, "layers_ignore", PROP_BOOLEAN, PROP_LAYER_MEMBER); RNA_def_property_boolean_sdna(prop, NULL, "notlay", 1); RNA_def_property_array(prop, 20); RNA_def_property_ui_text(prop, "Ignore Layers", "Hide objects on these layers when generating the Environment Map"); @@ -666,7 +667,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); @@ -692,7 +693,7 @@ static void rna_def_texture_clouds(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Type", ""); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "stype", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "cloud_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "stype"); RNA_def_property_enum_items(prop, prop_clouds_stype); RNA_def_property_ui_text(prop, "Color", ""); @@ -727,7 +728,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); @@ -753,13 +754,13 @@ static void rna_def_texture_wood(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Type", ""); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "stype", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "wood_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "stype"); RNA_def_property_enum_items(prop, prop_wood_stype); 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 +795,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); @@ -821,7 +822,7 @@ static void rna_def_texture_marble(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Type", ""); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); - prop= RNA_def_property(srna, "stype", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "marble_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "stype"); RNA_def_property_enum_items(prop, prop_marble_stype); RNA_def_property_ui_text(prop, "Pattern", ""); @@ -833,7 +834,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 +902,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 +938,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); @@ -950,7 +951,7 @@ static void rna_def_texture_stucci(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Noise Type", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "stype", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "stucci_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "stype"); RNA_def_property_enum_items(prop, prop_stucci_stype); RNA_def_property_ui_text(prop, "Pattern", ""); @@ -990,13 +991,13 @@ static void rna_def_texture_image(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Image Texture", ""); RNA_def_struct_sdna(srna, "Tex"); - prop= RNA_def_property(srna, "interpolation", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_interpolation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_INTERPOL); RNA_def_property_ui_text(prop, "Interpolation", "Interpolates pixels using Area filter"); 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 +1007,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 +1037,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 +1119,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 +1198,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 +1234,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 +1317,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 +1329,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 +1358,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 +1452,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 +1476,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 +1501,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 +1615,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"); @@ -1624,12 +1625,12 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Resolution", "Resolution of the voxel grid"); RNA_def_property_update(prop, 0, "rna_Texture_voxeldata_update"); - prop= RNA_def_property(srna, "still", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_still_frame", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_VD_STILL); 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"); @@ -1696,7 +1697,7 @@ static void rna_def_texture(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Color Ramp", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "brightness", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "intensity", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "bright"); RNA_def_property_range(prop, 0, 2); RNA_def_property_ui_text(prop, "Brightness", ""); diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index a9b2672e205..a659ff7c260 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -207,6 +207,7 @@ static StructRNA *rna_Panel_register(const bContext *C, ReportList *reports, voi pt->ext.call= call; pt->ext.free= free; RNA_struct_blender_type_set(pt->ext.srna, pt); + RNA_def_struct_flag(pt->ext.srna, STRUCT_NO_IDPROPERTIES); pt->poll= (have_function[0])? panel_poll: NULL; pt->draw= (have_function[1])? panel_draw: NULL; @@ -418,6 +419,7 @@ static StructRNA *rna_Menu_register(const bContext *C, ReportList *reports, void mt->ext.call= call; mt->ext.free= free; RNA_struct_blender_type_set(mt->ext.srna, mt); + RNA_def_struct_flag(mt->ext.srna, STRUCT_NO_IDPROPERTIES); mt->poll= (have_function[0])? menu_poll: NULL; mt->draw= (have_function[1])? menu_draw: NULL; diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 188eda32463..67b8ca057c8 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -324,7 +324,7 @@ static StructRNA *rna_OperatorProperties_refine(PointerRNA *ptr) return ptr->type; } -static IDProperty *rna_OperatorProperties_idproperties(PointerRNA *ptr, int create) +static IDProperty *rna_OperatorProperties_idprops(PointerRNA *ptr, int create) { if(create && !ptr->data) { IDPropertyTemplate val = {0}; @@ -1023,7 +1023,7 @@ static void rna_def_operator(BlenderRNA *brna) srna= RNA_def_struct(brna, "OperatorProperties", NULL); RNA_def_struct_ui_text(srna, "Operator Properties", "Input properties of an Operator"); RNA_def_struct_refine_func(srna, "rna_OperatorProperties_refine"); - RNA_def_struct_idproperties_func(srna, "rna_OperatorProperties_idproperties"); + RNA_def_struct_idprops_func(srna, "rna_OperatorProperties_idprops"); } static void rna_def_macro_operator(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index f4517c8a5ee..f792f13258f 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)"); @@ -324,12 +324,12 @@ static void rna_def_lighting(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Correction", "Ad-hoc correction for over-occlusion due to the approximation (for Approximate)"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "falloff", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_falloff", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "aomode", WO_AODIST); 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"); @@ -502,42 +502,42 @@ void RNA_def_world(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Exposure", "Amount of exponential color correction for light"); RNA_def_property_update(prop, 0, "rna_World_update"); - prop= RNA_def_property(srna, "range", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "color_range", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "range"); RNA_def_property_range(prop, 0.2, 5.0); RNA_def_property_ui_text(prop, "Range", "The color range that will be mapped to 0-1"); 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"); /* nested structs */ - prop= RNA_def_property(srna, "lighting", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "light_settings", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "WorldLighting"); RNA_def_property_pointer_funcs(prop, "rna_World_lighting_get", NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Lighting", "World lighting settings"); - prop= RNA_def_property(srna, "mist", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "mist_settings", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "WorldMistSettings"); RNA_def_property_pointer_funcs(prop, "rna_World_mist_get", NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Mist", "World mist settings"); - prop= RNA_def_property(srna, "stars", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "star_settings", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "WorldStarsSettings"); RNA_def_property_pointer_funcs(prop, "rna_World_stars_get", NULL, NULL, NULL); diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner.py b/source/blender/makesrna/rna_cleanup/rna_cleaner.py index 71a5a4eb611..ae17ade36d7 100755 --- a/source/blender/makesrna/rna_cleanup/rna_cleaner.py +++ b/source/blender/makesrna/rna_cleanup/rna_cleaner.py @@ -114,14 +114,17 @@ def get_props_from_txt(input_filename): done = 0 tot = 0 - for line in file_lines: + for iii, line in enumerate(file_lines): # debug #print(line) - + line_strip = line.strip() # empty line or comment - if not line.strip(): + if not line_strip: continue + + if line_strip == "EOF": + break if line.startswith("#"): line = line[1:] diff --git a/source/blender/makesrna/rna_cleanup/rna_properties.txt b/source/blender/makesrna/rna_cleanup/rna_properties.txt index 7cacae1d026..b319ce15ba1 100644 --- a/source/blender/makesrna/rna_cleanup/rna_properties.txt +++ b/source/blender/makesrna/rna_cleanup/rna_properties.txt @@ -183,8 +183,8 @@ #AnimViz.motion_path -> motion_path: pointer, "(read-only) Motion Path settings for visualisation" #AnimViz.onion_skin_frames -> onion_skin_frames: pointer, "(read-only) Onion Skinning (ghosting) settings for visualisation" #+ * AnimVizMotionPaths.bake_location -> bake_location: enum "When calculating Bone Paths, use Head or Tips" - + * AnimVizMotionPaths.after_current -> frame_after: int "Number of frames to show after the current frame (only for Around Current Frame Onion-skinning method)" - + * AnimVizMotionPaths.before_current -> frame_before: int "Number of frames to show before the current frame (only for Around Current Frame Onion-skinning method)" +#AnimVizMotionPaths.frame_after -> frame_after: int "Number of frames to show after the current frame (only for Around Current Frame Onion-skinning method)" +#AnimVizMotionPaths.frame_before -> frame_before: int "Number of frames to show before the current frame (only for Around Current Frame Onion-skinning method)" #+ * AnimVizMotionPaths.frame_end -> frame_end: int "End frame of range of paths to display/calculate (not for Around Current Frame Onion-skinning method)" #+ * AnimVizMotionPaths.frame_start -> frame_start: int "Starting frame of range of paths to display/calculate (not for Around Current Frame Onion-skinning method)" #+ * AnimVizMotionPaths.frame_step -> frame_step: int "Number of frames between paths shown (not for On Keyframes Onion-skinning method)" @@ -193,8 +193,8 @@ #AnimVizMotionPaths.show_keyframe_highlight -> show_keyframe_highlight: boolean "Emphasize position of keyframes on Motion Paths" #+ * AnimVizMotionPaths.show_keyframe_numbers -> show_keyframe_numbers: boolean "Show frame numbers of Keyframes on Motion Paths" #+ * AnimVizMotionPaths.type -> type: enum "Type of range to show for Motion Paths" - + * AnimVizOnionSkinning.after_current -> frame_after: int "Number of frames to show after the current frame (only for Around Current Frame Onion-skinning method)" - + * AnimVizOnionSkinning.before_current -> frame_before: int "Number of frames to show before the current frame (only for Around Current Frame Onion-skinning method)" +#AnimVizOnionSkinning.frame_after -> frame_after: int "Number of frames to show after the current frame (only for Around Current Frame Onion-skinning method)" +#AnimVizOnionSkinning.frame_before -> frame_before: int "Number of frames to show before the current frame (only for Around Current Frame Onion-skinning method)" #+ * AnimVizOnionSkinning.frame_end -> frame_end: int "End frame of range of Ghosts to display (not for Around Current Frame Onion-skinning method)" #+ * AnimVizOnionSkinning.frame_start -> frame_start: int "Starting frame of range of Ghosts to display (not for Around Current Frame Onion-skinning method)" #+ * AnimVizOnionSkinning.frame_step -> frame_step: int "Number of frames between ghosts shown (not for On Keyframes Onion-skinning method)" @@ -237,48 +237,48 @@ #+ * BoidRule|BoidRuleAverageSpeed.wander -> wander: float "How fast velocitys direction is randomized" #+ * BoidRule|BoidRuleAvoid.fear_factor -> fear_factor: float "Avoid object if danger from it is above this threshold" #+ * BoidRule|BoidRuleAvoid.object -> object: pointer "Object to avoid" - + * BoidRule|BoidRuleAvoid.predict -> use_predict: boolean "Predict target movement" +#BoidRule|BoidRuleAvoid.use_predict -> use_predict: boolean "Predict target movement" #+ * BoidRule|BoidRuleAvoidCollision.look_ahead -> look_ahead: float "Time to look ahead in seconds" - + * BoidRule|BoidRuleAvoidCollision.boids -> use_avoid: boolean "Avoid collision with other boids" - + * BoidRule|BoidRuleAvoidCollision.deflectors -> use_avoid_collision: boolean "Avoid collision with deflector objects" +#BoidRule|BoidRuleAvoidCollision.use_avoid -> use_avoid: boolean "Avoid collision with other boids" +#BoidRule|BoidRuleAvoidCollision.use_avoid_collision -> use_avoid_collision: boolean "Avoid collision with deflector objects" #+ * BoidRule|BoidRuleFight.distance -> distance: float "Attack boids at max this distance" #+ * BoidRule|BoidRuleFight.flee_distance -> flee_distance: float "Flee to this distance" #+ * BoidRule|BoidRuleFollowLeader.distance -> distance: float "Distance behind leader to follow" #+ * BoidRule|BoidRuleFollowLeader.object -> object: pointer "Follow this object instead of a boid" - + * BoidRule|BoidRuleFollowLeader.queue_size -> queue_count: int "How many boids in a line" - + * BoidRule|BoidRuleFollowLeader.line -> use_line: boolean "Follow leader in a line" +#BoidRule|BoidRuleFollowLeader.queue_count -> queue_count: int "How many boids in a line" +#BoidRule|BoidRuleFollowLeader.use_line -> use_line: boolean "Follow leader in a line" #+ * BoidRule|BoidRuleGoal.object -> object: pointer "Goal object" - + * BoidRule|BoidRuleGoal.predict -> use_predict: boolean "Predict target movement" +#BoidRule|BoidRuleGoal.use_predict -> use_predict: boolean "Predict target movement" #+ * BoidSettings.accuracy -> accuracy: float "Accuracy of attack" #+ * BoidSettings.active_boid_state -> active_boid_state: pointer, "(read-only)" #+ * BoidSettings.active_boid_state_index -> active_boid_state_index: int "NO DESCRIPTION" #+ * BoidSettings.aggression -> aggression: float "Boid will fight this times stronger enemy" - + * BoidSettings.air_max_acc -> air_acc_max: float "Maximum acceleration in air (relative to maximum speed)" - + * BoidSettings.air_max_ave -> air_ave_max: float "Maximum angular velocity in air (relative to 180 degrees)" +#BoidSettings.air_acc_max -> air_acc_max: float "Maximum acceleration in air (relative to maximum speed)" +#BoidSettings.air_ave_max -> air_ave_max: float "Maximum angular velocity in air (relative to 180 degrees)" #+ * BoidSettings.air_personal_space -> air_personal_space: float "Radius of boids personal space in air (% of particle size)" - + * BoidSettings.air_max_speed -> air_speed_max: float "Maximum speed in air" - + * BoidSettings.air_min_speed -> air_speed_min: float "Minimum speed in air (relative to maximum speed)" - + * BoidSettings.banking -> bank: float "Amount of rotation around velocity vector on turns" +#BoidSettings.air_speed_max -> air_speed_max: float "Maximum speed in air" +#BoidSettings.air_speed_min -> air_speed_min: float "Minimum speed in air (relative to maximum speed)" +#BoidSettings.bank -> bank: float "Amount of rotation around velocity vector on turns" #+ * BoidSettings.health -> health: float "Initial boid health when born" #+ * BoidSettings.height -> height: float "Boid height relative to particle size" - + * BoidSettings.land_max_acc -> land_acc_max: float "Maximum acceleration on land (relative to maximum speed)" - + * BoidSettings.land_max_ave -> land_ave_max: float "Maximum angular velocity on land (relative to 180 degrees)" +#BoidSettings.land_acc_max -> land_acc_max: float "Maximum acceleration on land (relative to maximum speed)" +#BoidSettings.land_ave_max -> land_ave_max: float "Maximum angular velocity on land (relative to 180 degrees)" #+ * BoidSettings.land_jump_speed -> land_jump_speed: float "Maximum speed for jumping" #+ * BoidSettings.land_personal_space -> land_personal_space: float "Radius of boids personal space on land (% of particle size)" - + * BoidSettings.landing_smoothness -> land_smooth: float "How smoothly the boids land" - + * BoidSettings.land_max_speed -> land_speed_max: float "Maximum speed on land" +#BoidSettings.land_smooth -> land_smooth: float "How smoothly the boids land" +#BoidSettings.land_speed_max -> land_speed_max: float "Maximum speed on land" #+ * BoidSettings.land_stick_force -> land_stick_force: float "How strong a force must be to start effecting a boid on land" #+ * BoidSettings.range -> range: float "The maximum distance from which a boid can attack" #+ * BoidSettings.states -> states: collection, "(read-only)" #+ * BoidSettings.strength -> strength: float "Maximum caused damage on attack per second" - + * BoidSettings.allow_climb -> use_climb: boolean "Allow boids to climb goal objects" - + * BoidSettings.allow_flight -> use_flight: boolean "Allow boids to move in air" - + * BoidSettings.allow_land -> use_land: boolean "Allow boids to move on land" +#BoidSettings.use_climb -> use_climb: boolean "Allow boids to climb goal objects" +#BoidSettings.use_flight -> use_flight: boolean "Allow boids to move in air" +#BoidSettings.use_land -> use_land: boolean "Allow boids to move on land" #+ * BoidState.active_boid_rule -> active_boid_rule: pointer, "(read-only)" #+ * BoidState.active_boid_rule_index -> active_boid_rule_index: int "NO DESCRIPTION" #+ * BoidState.falloff -> falloff: float "NO DESCRIPTION" #+ * BoidState.name -> name: string "Boid state name" - + * BoidState.rule_fuzziness -> rule_fuzzy: float "NO DESCRIPTION" +#BoidState.rule_fuzzy -> rule_fuzzy: float "NO DESCRIPTION" #+ * BoidState.rules -> rules: collection, "(read-only)" #+ * BoidState.ruleset_type -> ruleset_type: enum "How the rules in the list are evaluated" #+ * BoidState.volume -> volume: float "NO DESCRIPTION" @@ -314,14 +314,14 @@ #+ * BoneGroup.colors -> colors: pointer, "(read-only) Copy of the colors associated with the groups color set" #+ * BoneGroup.name -> name: string "NO DESCRIPTION" #+ * ClothCollisionSettings.collision_quality -> collision_quality: int "How many collision iterations should be done. (higher is better quality but slower)" - + * ClothCollisionSettings.min_distance -> distance_min: float "Minimum distance between collision objects before collision response takes in" +#ClothCollisionSettings.distance_min -> distance_min: float "Minimum distance between collision objects before collision response takes in" #+ * ClothCollisionSettings.friction -> friction: float "Friction force if a collision happened. (higher = less movement)" #+ * ClothCollisionSettings.group -> group: pointer "Limit colliders to this Group" #+ * ClothCollisionSettings.self_collision_quality -> self_collision_quality: int "How many self collision iterations should be done. (higher is better quality but slower)" - + * ClothCollisionSettings.self_min_distance -> self_distance_min: float "0.5 means no distance at all, 1.0 is maximum distance" +#ClothCollisionSettings.self_distance_min -> self_distance_min: float "0.5 means no distance at all, 1.0 is maximum distance" #+ * ClothCollisionSettings.self_friction -> self_friction: float "Friction/damping with self contact" - + * ClothCollisionSettings.enable_collision -> use_collision: boolean "Enable collisions with other objects" - + * ClothCollisionSettings.enable_self_collision -> use_self_collision: boolean "Enable self collisions" +#ClothCollisionSettings.use_collision -> use_collision: boolean "Enable collisions with other objects" +#ClothCollisionSettings.use_self_collision -> use_self_collision: boolean "Enable self collisions" #+ * ClothSettings.air_damping -> air_damping: float "Air has normally some thickness which slows falling things down" #+ * ClothSettings.bending_stiffness -> bending_stiffness: float "Wrinkle coefficient. (higher = less smaller but more big wrinkles)" #+ * ClothSettings.bending_stiffness_max -> bending_stiffness_max: float "Maximum bending stiffness value" @@ -345,20 +345,20 @@ #+ * ClothSettings.structural_stiffness -> structural_stiffness: float "Overall stiffness of structure" #+ * ClothSettings.structural_stiffness_max -> structural_stiffness_max: float "Maximum structural stiffness value" #+ * ClothSettings.structural_stiffness_vertex_group -> structural_stiffness_vertex_group: string "Vertex group for fine control over structural stiffness" - + * ClothSettings.pin_cloth -> use_pin_cloth: boolean "Enable pinning of cloth vertices to other objects/positions" - + * ClothSettings.stiffness_scaling -> use_stiffness_scale: boolean "If enabled, stiffness can be scaled along a weight painted vertex group" +#ClothSettings.use_pin_cloth -> use_pin_cloth: boolean "Enable pinning of cloth vertices to other objects/positions" +#ClothSettings.use_stiffness_scale -> use_stiffness_scale: boolean "If enabled, stiffness can be scaled along a weight painted vertex group" #+ * CollisionSettings.absorption -> absorption: float "How much of effector force gets lost during collision with this object (in percent)" #+ * CollisionSettings.damping -> damping: float "Amount of damping during collision" #+ * CollisionSettings.damping_factor -> damping_factor: float "Amount of damping during particle collision" - + * CollisionSettings.random_damping -> damping_random: float "Random variation of damping" +#CollisionSettings.damping_random -> damping_random: float "Random variation of damping" #+ * CollisionSettings.friction_factor -> friction_factor: float "Amount of friction during particle collision" - + * CollisionSettings.random_friction -> friction_random: float "Random variation of friction" +#CollisionSettings.friction_random -> friction_random: float "Random variation of friction" #+ * CollisionSettings.permeability -> permeability: float "Chance that the particle will pass through the mesh" #+ * CollisionSettings.stickness -> stickness: float "Amount of stickness to surface collision" - + * CollisionSettings.inner_thickness -> thickness_inner: float "Inner face thickness" - + * CollisionSettings.outer_thickness -> thickness_outer: float "Outer face thickness" +#CollisionSettings.thickness_inner -> thickness_inner: float "Inner face thickness" +#CollisionSettings.thickness_outer -> thickness_outer: float "Outer face thickness" #+ * CollisionSettings.use -> use: boolean "Enable this objects as a collider for physics systems" - + * CollisionSettings.kill_particles -> use_particle_kill: boolean "Kill collided particles" +#CollisionSettings.use_particle_kill -> use_particle_kill: boolean "Kill collided particles" #+ * ColorRamp.elements -> elements: collection, "(read-only)" #+ * ColorRamp.interpolation -> interpolation: enum "NO DESCRIPTION" #+ * ColorRampElement.color -> color: float[4] "NO DESCRIPTION" @@ -369,8 +369,8 @@ #Constraint.error_location -> error_location: float, "(read-only) Amount of residual error in Blender space unit for constraints that work on position" #Constraint.error_rotation -> error_rotation: float, "(read-only) Amount of residual error in radiant for constraints that work on orientation" #+ * Constraint.influence -> influence: float "Amount of influence constraint will have on the final solution" - + * Constraint.proxy_local -> is_proxy_local: boolean "Constraint was added in this proxy instance (i.e. did not belong to source Armature)" - + * Constraint.disabled -> is_valid: boolean, "(read-only) Constraint has invalid settings and will not be evaluated" +#Constraint.is_proxy_local -> is_proxy_local: boolean "Constraint was added in this proxy instance (i.e. did not belong to source Armature)" +#Constraint.is_valid -> is_valid: boolean, "(read-only) Constraint has invalid settings and will not be evaluated" #+ * Constraint.mute -> mute: boolean "Enable/Disable Constraint" #+ * Constraint.name -> name: string "Constraint name" #+ * Constraint.owner_space -> owner_space: enum "Space that owner is evaluated in" @@ -382,8 +382,8 @@ #+ * Constraint|ActionConstraint.action -> action: pointer "NO DESCRIPTION" #+ * Constraint|ActionConstraint.frame_end -> frame_end: int "Last frame of the Action to use" #+ * Constraint|ActionConstraint.frame_start -> frame_start: int "First frame of the Action to use" - + * Constraint|ActionConstraint.maximum -> max: float "Maximum value for target channel range" - + * Constraint|ActionConstraint.minimum -> min: float "Minimum value for target channel range" +#Constraint|ActionConstraint.max -> max: float "Maximum value for target channel range" +#Constraint|ActionConstraint.min -> min: float "Minimum value for target channel range" #+ * Constraint|ActionConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|ActionConstraint.target -> target: pointer "Target Object" #+ * Constraint|ActionConstraint.transform_channel -> transform_channel: enum "Transformation channel from the target that is used to key the Action" @@ -400,7 +400,7 @@ #+ * Constraint|ChildOfConstraint.use_scale_z -> use_scale_z: boolean "Use Z Scale of Parent" #+ * Constraint|ClampToConstraint.main_axis -> main_axis: enum "Main axis of movement" #+ * Constraint|ClampToConstraint.target -> target: pointer "Target Object" - + * Constraint|ClampToConstraint.cyclic -> use_cyclic: boolean "Treat curve as cyclic curve (no clamping to curve bounding box" +#Constraint|ClampToConstraint.use_cyclic -> use_cyclic: boolean "Treat curve as cyclic curve (no clamping to curve bounding box" #+ * Constraint|CopyLocationConstraint.head_tail -> head_tail: float "Target along length of bone: Head=0, Tail=1" #+ * Constraint|CopyLocationConstraint.invert_x -> invert_x: boolean "Invert the X location" #+ * Constraint|CopyLocationConstraint.invert_y -> invert_y: boolean "Invert the Y location" @@ -431,40 +431,40 @@ #+ * Constraint|CopyTransformsConstraint.target -> target: pointer "Target Object" #+ * Constraint|DampedTrackConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|DampedTrackConstraint.target -> target: pointer "Target Object" - + * Constraint|DampedTrackConstraint.track -> track_axis: enum "Axis that points to the target object" +#Constraint|DampedTrackConstraint.track_axis -> track_axis: enum "Axis that points to the target object" #+ * Constraint|FloorConstraint.floor_location -> floor_location: enum "Location of target that object will not pass through" #+ * Constraint|FloorConstraint.offset -> offset: float "Offset of floor from object origin" #+ * Constraint|FloorConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|FloorConstraint.target -> target: pointer "Target Object" #+ * Constraint|FloorConstraint.use_rotation -> use_rotation: boolean "Use the targets rotation to determine floor" - + * Constraint|FloorConstraint.sticky -> use_sticky: boolean "Immobilize object while constrained" - + * Constraint|FollowPathConstraint.forward -> forward_axis: enum "Axis that points forward along the path" +#Constraint|FloorConstraint.use_sticky -> use_sticky: boolean "Immobilize object while constrained" +#Constraint|FollowPathConstraint.forward_axis -> forward_axis: enum "Axis that points forward along the path" #+ * Constraint|FollowPathConstraint.offset -> offset: int "Offset from the position corresponding to the time frame" #+ * Constraint|FollowPathConstraint.offset_factor -> offset_factor: float "Percentage value defining target position along length of bone" #+ * Constraint|FollowPathConstraint.target -> target: pointer "Target Object" - + * Constraint|FollowPathConstraint.up -> up_axis: enum "Axis that points upward" +#Constraint|FollowPathConstraint.up_axis -> up_axis: enum "Axis that points upward" #+ * Constraint|FollowPathConstraint.use_curve_follow -> use_curve_follow: boolean "Object will follow the heading and banking of the curve" #+ * Constraint|FollowPathConstraint.use_curve_radius -> use_curve_radius: boolean "Objects scale by the curve radius" - + * Constraint|FollowPathConstraint.use_fixed_position -> use_fixed_location: boolean "Object will stay locked to a single point somewhere along the length of the curve regardless of time" - + * Constraint|KinematicConstraint.chain_length -> chain_count: int "How many bones are included in the IK effect - 0 uses all bones" +#Constraint|FollowPathConstraint.use_fixed_location -> use_fixed_location: boolean "Object will stay locked to a single point somewhere along the length of the curve regardless of time" +#Constraint|KinematicConstraint.chain_count -> chain_count: int "How many bones are included in the IK effect - 0 uses all bones" #+ * Constraint|KinematicConstraint.distance -> distance: float "Radius of limiting sphere" #+ * Constraint|KinematicConstraint.ik_type -> ik_type: enum "NO DESCRIPTION" #+ * Constraint|KinematicConstraint.iterations -> iterations: int "Maximum number of solving iterations" #+ * Constraint|KinematicConstraint.limit_mode -> limit_mode: enum "Distances in relation to sphere of influence to allow" - + * Constraint|KinematicConstraint.pos_lock_x -> lock_location_x: boolean "Constraint position along X axis" - + * Constraint|KinematicConstraint.pos_lock_y -> lock_location_y: boolean "Constraint position along Y axis" - + * Constraint|KinematicConstraint.pos_lock_z -> lock_location_z: boolean "Constraint position along Z axis" - + * Constraint|KinematicConstraint.rot_lock_x -> lock_rotation_x: boolean "Constraint rotation along X axis" - + * Constraint|KinematicConstraint.rot_lock_y -> lock_rotation_y: boolean "Constraint rotation along Y axis" - + * Constraint|KinematicConstraint.rot_lock_z -> lock_rotation_z: boolean "Constraint rotation along Z axis" +#Constraint|KinematicConstraint.lock_location_x -> lock_location_x: boolean "Constraint position along X axis" +#Constraint|KinematicConstraint.lock_location_y -> lock_location_y: boolean "Constraint position along Y axis" +#Constraint|KinematicConstraint.lock_location_z -> lock_location_z: boolean "Constraint position along Z axis" +#Constraint|KinematicConstraint.lock_rotation_x -> lock_rotation_x: boolean "Constraint rotation along X axis" +#Constraint|KinematicConstraint.lock_rotation_y -> lock_rotation_y: boolean "Constraint rotation along Y axis" +#Constraint|KinematicConstraint.lock_rotation_z -> lock_rotation_z: boolean "Constraint rotation along Z axis" #+ * Constraint|KinematicConstraint.orient_weight -> orient_weight: float "For Tree-IK: Weight of orientation control for this target" #+ * Constraint|KinematicConstraint.pole_angle -> pole_angle: float "Pole rotation offset" #+ * Constraint|KinematicConstraint.pole_subtarget -> pole_subtarget: string "NO DESCRIPTION" #+ * Constraint|KinematicConstraint.pole_target -> pole_target: pointer "Object for pole rotation" - + * Constraint|KinematicConstraint.axis_reference -> reference_axis: enum "Constraint axis Lock options relative to Bone or Target reference" +#Constraint|KinematicConstraint.reference_axis -> reference_axis: enum "Constraint axis Lock options relative to Bone or Target reference" #+ * Constraint|KinematicConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|KinematicConstraint.target -> target: pointer "Target Object" - + * Constraint|KinematicConstraint.use_position -> use_location: boolean "Chain follows position of target" +#Constraint|KinematicConstraint.use_location -> use_location: boolean "Chain follows position of target" #+ * Constraint|KinematicConstraint.use_rotation -> use_rotation: boolean "Chain follows rotation of target" #+ * Constraint|KinematicConstraint.use_stretch -> use_stretch: boolean "Enable IK Stretching" #+ * Constraint|KinematicConstraint.use_tail -> use_tail: boolean "Include bones tail as last element in chain" @@ -474,56 +474,56 @@ #+ * Constraint|LimitDistanceConstraint.limit_mode -> limit_mode: enum "Distances in relation to sphere of influence to allow" #+ * Constraint|LimitDistanceConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|LimitDistanceConstraint.target -> target: pointer "Target Object" - + * Constraint|LimitLocationConstraint.maximum_x -> max_x: float "Highest X value to allow" - + * Constraint|LimitLocationConstraint.maximum_y -> max_y: float "Highest Y value to allow" - + * Constraint|LimitLocationConstraint.maximum_z -> max_z: float "Highest Z value to allow" - + * Constraint|LimitLocationConstraint.minimum_x -> min_x: float "Lowest X value to allow" - + * Constraint|LimitLocationConstraint.minimum_y -> min_y: float "Lowest Y value to allow" - + * Constraint|LimitLocationConstraint.minimum_z -> min_z: float "Lowest Z value to allow" - + * Constraint|LimitLocationConstraint.use_maximum_x -> use_max_x: boolean "Use the maximum X value" - + * Constraint|LimitLocationConstraint.use_maximum_y -> use_max_y: boolean "Use the maximum Y value" - + * Constraint|LimitLocationConstraint.use_maximum_z -> use_max_z: boolean "Use the maximum Z value" - + * Constraint|LimitLocationConstraint.use_minimum_x -> use_min_x: boolean "Use the minimum X value" - + * Constraint|LimitLocationConstraint.use_minimum_y -> use_min_y: boolean "Use the minimum Y value" - + * Constraint|LimitLocationConstraint.use_minimum_z -> use_min_z: boolean "Use the minimum Z value" - + * Constraint|LimitLocationConstraint.limit_transform -> use_transform_limit: boolean "Transforms are affected by this constraint as well" - + * Constraint|LimitRotationConstraint.maximum_x -> max_x: float "Highest X value to allow" - + * Constraint|LimitRotationConstraint.maximum_y -> max_y: float "Highest Y value to allow" - + * Constraint|LimitRotationConstraint.maximum_z -> max_z: float "Highest Z value to allow" - + * Constraint|LimitRotationConstraint.minimum_x -> min_x: float "Lowest X value to allow" - + * Constraint|LimitRotationConstraint.minimum_y -> min_y: float "Lowest Y value to allow" - + * Constraint|LimitRotationConstraint.minimum_z -> min_z: float "Lowest Z value to allow" +#Constraint|LimitLocationConstraint.max_x -> max_x: float "Highest X value to allow" +#Constraint|LimitLocationConstraint.max_y -> max_y: float "Highest Y value to allow" +#Constraint|LimitLocationConstraint.max_z -> max_z: float "Highest Z value to allow" +#Constraint|LimitLocationConstraint.min_x -> min_x: float "Lowest X value to allow" +#Constraint|LimitLocationConstraint.min_y -> min_y: float "Lowest Y value to allow" +#Constraint|LimitLocationConstraint.min_z -> min_z: float "Lowest Z value to allow" +#Constraint|LimitLocationConstraint.use_max_x -> use_max_x: boolean "Use the maximum X value" +#Constraint|LimitLocationConstraint.use_max_y -> use_max_y: boolean "Use the maximum Y value" +#Constraint|LimitLocationConstraint.use_max_z -> use_max_z: boolean "Use the maximum Z value" +#Constraint|LimitLocationConstraint.use_min_x -> use_min_x: boolean "Use the minimum X value" +#Constraint|LimitLocationConstraint.use_min_y -> use_min_y: boolean "Use the minimum Y value" +#Constraint|LimitLocationConstraint.use_min_z -> use_min_z: boolean "Use the minimum Z value" +#Constraint|LimitLocationConstraint.use_transform_limit -> use_transform_limit: boolean "Transforms are affected by this constraint as well" +#Constraint|LimitRotationConstraint.max_x -> max_x: float "Highest X value to allow" +#Constraint|LimitRotationConstraint.max_y -> max_y: float "Highest Y value to allow" +#Constraint|LimitRotationConstraint.max_z -> max_z: float "Highest Z value to allow" +#Constraint|LimitRotationConstraint.min_x -> min_x: float "Lowest X value to allow" +#Constraint|LimitRotationConstraint.min_y -> min_y: float "Lowest Y value to allow" +#Constraint|LimitRotationConstraint.min_z -> min_z: float "Lowest Z value to allow" #+ * Constraint|LimitRotationConstraint.use_limit_x -> use_limit_x: boolean "Use the minimum X value" #+ * Constraint|LimitRotationConstraint.use_limit_y -> use_limit_y: boolean "Use the minimum Y value" #+ * Constraint|LimitRotationConstraint.use_limit_z -> use_limit_z: boolean "Use the minimum Z value" - + * Constraint|LimitRotationConstraint.limit_transform -> use_transform_limit: boolean "Transforms are affected by this constraint as well" - + * Constraint|LimitScaleConstraint.maximum_x -> max_x: float "Highest X value to allow" - + * Constraint|LimitScaleConstraint.maximum_y -> max_y: float "Highest Y value to allow" - + * Constraint|LimitScaleConstraint.maximum_z -> max_z: float "Highest Z value to allow" - + * Constraint|LimitScaleConstraint.minimum_x -> min_x: float "Lowest X value to allow" - + * Constraint|LimitScaleConstraint.minimum_y -> min_y: float "Lowest Y value to allow" - + * Constraint|LimitScaleConstraint.minimum_z -> min_z: float "Lowest Z value to allow" - + * Constraint|LimitScaleConstraint.use_maximum_x -> use_max_x: boolean "Use the maximum X value" - + * Constraint|LimitScaleConstraint.use_maximum_y -> use_max_y: boolean "Use the maximum Y value" - + * Constraint|LimitScaleConstraint.use_maximum_z -> use_max_z: boolean "Use the maximum Z value" - + * Constraint|LimitScaleConstraint.use_minimum_x -> use_min_x: boolean "Use the minimum X value" - + * Constraint|LimitScaleConstraint.use_minimum_y -> use_min_y: boolean "Use the minimum Y value" - + * Constraint|LimitScaleConstraint.use_minimum_z -> use_min_z: boolean "Use the minimum Z value" - + * Constraint|LimitScaleConstraint.limit_transform -> use_transform_limit: boolean "Transforms are affected by this constraint as well" - + * Constraint|LockedTrackConstraint.lock -> lock_axis: enum "Axis that points upward" +#Constraint|LimitRotationConstraint.use_transform_limit -> use_transform_limit: boolean "Transforms are affected by this constraint as well" +#Constraint|LimitScaleConstraint.max_x -> max_x: float "Highest X value to allow" +#Constraint|LimitScaleConstraint.max_y -> max_y: float "Highest Y value to allow" +#Constraint|LimitScaleConstraint.max_z -> max_z: float "Highest Z value to allow" +#Constraint|LimitScaleConstraint.min_x -> min_x: float "Lowest X value to allow" +#Constraint|LimitScaleConstraint.min_y -> min_y: float "Lowest Y value to allow" +#Constraint|LimitScaleConstraint.min_z -> min_z: float "Lowest Z value to allow" +#Constraint|LimitScaleConstraint.use_max_x -> use_max_x: boolean "Use the maximum X value" +#Constraint|LimitScaleConstraint.use_max_y -> use_max_y: boolean "Use the maximum Y value" +#Constraint|LimitScaleConstraint.use_max_z -> use_max_z: boolean "Use the maximum Z value" +#Constraint|LimitScaleConstraint.use_min_x -> use_min_x: boolean "Use the minimum X value" +#Constraint|LimitScaleConstraint.use_min_y -> use_min_y: boolean "Use the minimum Y value" +#Constraint|LimitScaleConstraint.use_min_z -> use_min_z: boolean "Use the minimum Z value" +#Constraint|LimitScaleConstraint.use_transform_limit -> use_transform_limit: boolean "Transforms are affected by this constraint as well" +#Constraint|LockedTrackConstraint.lock_axis -> lock_axis: enum "Axis that points upward" #+ * Constraint|LockedTrackConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|LockedTrackConstraint.target -> target: pointer "Target Object" - + * Constraint|LockedTrackConstraint.track -> track_axis: enum "Axis that points to the target object" - + * Constraint|MaintainVolumeConstraint.axis -> free_axis: enum "The free scaling axis of the object" +#Constraint|LockedTrackConstraint.track_axis -> track_axis: enum "Axis that points to the target object" +#Constraint|MaintainVolumeConstraint.free_axis -> free_axis: enum "The free scaling axis of the object" #+ * Constraint|MaintainVolumeConstraint.volume -> volume: float "Volume of the bone at rest" #+ * Constraint|PivotConstraint.head_tail -> head_tail: float "Target along length of bone: Head=0, Tail=1" #+ * Constraint|PivotConstraint.offset -> offset: float[3] "Offset of pivot from target (when set), or from owners location (when Fixed Position is off), or the absolute pivot point" - + * Constraint|PivotConstraint.enabled_rotation_range -> rotation_range: enum "Rotation range on which pivoting should occur" +#Constraint|PivotConstraint.rotation_range -> rotation_range: enum "Rotation range on which pivoting should occur" #+ * Constraint|PivotConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|PivotConstraint.target -> target: pointer "Target Object, defining the position of the pivot when defined" - + * Constraint|PivotConstraint.use_relative_position -> use_relative_location: boolean "Offset will be an absolute point in space instead of relative to the target" +#Constraint|PivotConstraint.use_relative_location -> use_relative_location: boolean "Offset will be an absolute point in space instead of relative to the target" #Constraint|PythonConstraint.has_script_error -> has_script_error: boolean, "(read-only) The linked Python script has thrown an error" - + * Constraint|PythonConstraint.number_of_targets -> target_count: int "Usually only 1-3 are needed" +#Constraint|PythonConstraint.target_count -> target_count: int "Usually only 1-3 are needed" #+ * Constraint|PythonConstraint.targets -> targets: collection, "(read-only) Target Objects" #+ * Constraint|PythonConstraint.text -> text: pointer "The text object that contains the Python script" #+ * Constraint|PythonConstraint.use_targets -> use_targets: boolean "Use the targets indicated in the constraint panel" @@ -544,27 +544,27 @@ #+ * Constraint|ShrinkwrapConstraint.use_x -> use_x: boolean "Projection over X Axis" #+ * Constraint|ShrinkwrapConstraint.use_y -> use_y: boolean "Projection over Y Axis" #+ * Constraint|ShrinkwrapConstraint.use_z -> use_z: boolean "Projection over Z Axis" - + * Constraint|SplineIKConstraint.chain_length -> chain_count: int "How many bones are included in the chain" +#Constraint|SplineIKConstraint.chain_count -> chain_count: int "How many bones are included in the chain" #+ * Constraint|SplineIKConstraint.joint_bindings -> joint_bindings: float[32] "(EXPERIENCED USERS ONLY) The relative positions of the joints along the chain as percentages" #+ * Constraint|SplineIKConstraint.target -> target: pointer "Curve that controls this relationship" - + * Constraint|SplineIKConstraint.chain_offset -> use_chain_offset: boolean "Offset the entire chain relative to the root joint" +#Constraint|SplineIKConstraint.use_chain_offset -> use_chain_offset: boolean "Offset the entire chain relative to the root joint" #+ * Constraint|SplineIKConstraint.use_curve_radius -> use_curve_radius: boolean "Average radius of the endpoints is used to tweak the X and Z Scaling of the bones, on top of XZ Scale mode" - + * Constraint|SplineIKConstraint.even_divisions -> use_even_divisions: boolean "Ignore the relative lengths of the bones when fitting to the curve" - + * Constraint|SplineIKConstraint.y_stretch -> use_y_stretch: boolean "Stretch the Y axis of the bones to fit the curve" - + * Constraint|SplineIKConstraint.xz_scaling_mode -> xz_scale_mode: enum "Method used for determining the scaling of the X and Z axes of the bones" +#Constraint|SplineIKConstraint.use_even_divisions -> use_even_divisions: boolean "Ignore the relative lengths of the bones when fitting to the curve" +#Constraint|SplineIKConstraint.use_y_stretch -> use_y_stretch: boolean "Stretch the Y axis of the bones to fit the curve" +#Constraint|SplineIKConstraint.xz_scale_mode -> xz_scale_mode: enum "Method used for determining the scaling of the X and Z axes of the bones" #+ * Constraint|StretchToConstraint.bulge -> bulge: float "Factor between volume variation and stretching" #+ * Constraint|StretchToConstraint.head_tail -> head_tail: float "Target along length of bone: Head=0, Tail=1" #+ * Constraint|StretchToConstraint.keep_axis -> keep_axis: enum "Axis to maintain during stretch" - + * Constraint|StretchToConstraint.original_length -> rest_length: float "Length at rest position" +#Constraint|StretchToConstraint.rest_length -> rest_length: float "Length at rest position" #+ * Constraint|StretchToConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|StretchToConstraint.target -> target: pointer "Target Object" #+ * Constraint|StretchToConstraint.volume -> volume: enum "Maintain the objects volume as it stretches" #+ * Constraint|TrackToConstraint.head_tail -> head_tail: float "Target along length of bone: Head=0, Tail=1" #+ * Constraint|TrackToConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|TrackToConstraint.target -> target: pointer "Target Object" - + * Constraint|TrackToConstraint.track -> track_axis: enum "Axis that points to the target object" - + * Constraint|TrackToConstraint.up -> up_axis: enum "Axis that points upward" - + * Constraint|TrackToConstraint.target_z -> use_target_z: boolean "Targets Z axis, not World Z axis, will constraint the Up direction" +#Constraint|TrackToConstraint.track_axis -> track_axis: enum "Axis that points to the target object" +#Constraint|TrackToConstraint.up_axis -> up_axis: enum "Axis that points upward" +#Constraint|TrackToConstraint.use_target_z -> use_target_z: boolean "Targets Z axis, not World Z axis, will constraint the Up direction" #+ * Constraint|TransformConstraint.from_max_x -> from_max_x: float "Top range of X axis source motion" #+ * Constraint|TransformConstraint.from_max_y -> from_max_y: float "Top range of Y axis source motion" #+ * Constraint|TransformConstraint.from_max_z -> from_max_z: float "Top range of Z axis source motion" @@ -584,7 +584,7 @@ #+ * Constraint|TransformConstraint.to_min_x -> to_min_x: float "Bottom range of X axis destination motion" #+ * Constraint|TransformConstraint.to_min_y -> to_min_y: float "Bottom range of Y axis destination motion" #+ * Constraint|TransformConstraint.to_min_z -> to_min_z: float "Bottom range of Z axis destination motion" - + * Constraint|TransformConstraint.extrapolate_motion -> use_motion_extrapolate: boolean "Extrapolate ranges" +#Constraint|TransformConstraint.use_motion_extrapolate -> use_motion_extrapolate: boolean "Extrapolate ranges" #+ * Context.area -> area: pointer, "(read-only)" #+ * Context.main -> main: pointer, "(read-only)" #+ * Context.mode -> mode: enum, "(read-only)" @@ -689,10 +689,10 @@ #EditBone.use_inherit_scale -> use_inherit_scale: boolean "Bone inherits scaling from parent bone" #EditBone.use_local_location -> use_local_location: boolean "Bone location is set in local space" #+ * EffectorWeights.all -> all: float "All effectors weight" - + * EffectorWeights.do_growing_hair -> apply_to_hair_growing: boolean "Use force fields when growing hair" +#EffectorWeights.apply_to_hair_growing -> apply_to_hair_growing: boolean "Use force fields when growing hair" #+ * EffectorWeights.boid -> boid: float "Boid effector weight" #+ * EffectorWeights.charge -> charge: float "Charge effector weight" - + * EffectorWeights.curveguide -> curve_guide: float "Curve guide effector weight" +#EffectorWeights.curve_guide -> curve_guide: float "Curve guide effector weight" #+ * EffectorWeights.drag -> drag: float "Drag effector weight" #+ * EffectorWeights.force -> force: float "Force effector weight" #+ * EffectorWeights.gravity -> gravity: float "Global gravity weight" @@ -711,7 +711,7 @@ #+ * EnvironmentMap.clip_end -> clip_end: float "Objects further than this are not visible to map" #+ * EnvironmentMap.clip_start -> clip_start: float "Objects nearer than this are not visible to map" #+ * EnvironmentMap.depth -> depth: int "Number of times a map will be rendered recursively (mirror effects.)" - + * EnvironmentMap.ignore_layers -> layers_ignore: boolean[20] "Hide objects on these layers when generating the Environment Map" +#EnvironmentMap.layers_ignore -> layers_ignore: boolean[20] "Hide objects on these layers when generating the Environment Map" #+ * EnvironmentMap.mapping -> mapping: enum "NO DESCRIPTION" #+ * EnvironmentMap.resolution -> resolution: int "Pixel resolution of the rendered environment map" #+ * EnvironmentMap.source -> source: enum "NO DESCRIPTION" @@ -757,47 +757,47 @@ #+ * FModifierEnvelopeControlPoint.frame -> frame: float "Frame this control-point occurs on" #FModifierEnvelopeControlPoint.max -> max: float "Upper bound of envelope at this control-point" #FModifierEnvelopeControlPoint.min -> min: float "Lower bound of envelope at this control-point" - + * FModifier|FModifierCycles.after_cycles -> cycles_after: float "Maximum number of cycles to allow after last keyframe. (0 = infinite)" - + * FModifier|FModifierCycles.before_cycles -> cycles_before: float "Maximum number of cycles to allow before first keyframe. (0 = infinite)" - + * FModifier|FModifierCycles.after_mode -> mode_after: enum "Cycling mode to use after last keyframe" - + * FModifier|FModifierCycles.before_mode -> mode_before: enum "Cycling mode to use before first keyframe" +#FModifier|FModifierCycles.cycles_after -> cycles_after: float "Maximum number of cycles to allow after last keyframe. (0 = infinite)" +#FModifier|FModifierCycles.cycles_before -> cycles_before: float "Maximum number of cycles to allow before first keyframe. (0 = infinite)" +#FModifier|FModifierCycles.mode_after -> mode_after: enum "Cycling mode to use after last keyframe" +#FModifier|FModifierCycles.mode_before -> mode_before: enum "Cycling mode to use before first keyframe" #+ * FModifier|FModifierEnvelope.control_points -> control_points: collection, "(read-only) Control points defining the shape of the envelope" - + * FModifier|FModifierEnvelope.default_maximum -> default_max: float "Upper distance from Reference Value for 1:1 default influence" - + * FModifier|FModifierEnvelope.default_minimum -> default_min: float "Lower distance from Reference Value for 1:1 default influence" +#FModifier|FModifierEnvelope.default_max -> default_max: float "Upper distance from Reference Value for 1:1 default influence" +#FModifier|FModifierEnvelope.default_min -> default_min: float "Lower distance from Reference Value for 1:1 default influence" #+ * FModifier|FModifierEnvelope.reference_value -> reference_value: float "Value that envelopes influence is centered around / based on" #+ * FModifier|FModifierFunctionGenerator.amplitude -> amplitude: float "Scale factor determining the maximum/minimum values" #+ * FModifier|FModifierFunctionGenerator.function_type -> function_type: enum "Type of built-in function to use" #+ * FModifier|FModifierFunctionGenerator.phase_multiplier -> phase_multiplier: float "Scale factor determining the speed of the function" #+ * FModifier|FModifierFunctionGenerator.phase_offset -> phase_offset: float "Constant factor to offset time by for function" - + * FModifier|FModifierFunctionGenerator.additive -> use_additive: boolean "Values generated by this modifier are applied on top of the existing values instead of overwriting them" +#FModifier|FModifierFunctionGenerator.use_additive -> use_additive: boolean "Values generated by this modifier are applied on top of the existing values instead of overwriting them" #+ * FModifier|FModifierFunctionGenerator.value_offset -> value_offset: float "Constant factor to offset values by" #+ * FModifier|FModifierGenerator.coefficients -> coefficients: float[32] "Coefficients for x (starting from lowest power of x^0)" #+ * FModifier|FModifierGenerator.mode -> mode: enum "Type of generator to use" #+ * FModifier|FModifierGenerator.poly_order -> poly_order: int "The highest power of x for this polynomial. (number of coefficients - 1)" - + * FModifier|FModifierGenerator.additive -> use_additive: boolean "Values generated by this modifier are applied on top of the existing values instead of overwriting them" - + * FModifier|FModifierLimits.maximum_x -> max_x: float "Highest X value to allow" - + * FModifier|FModifierLimits.maximum_y -> max_y: float "Highest Y value to allow" - + * FModifier|FModifierLimits.minimum_x -> min_x: float "Lowest X value to allow" - + * FModifier|FModifierLimits.minimum_y -> min_y: float "Lowest Y value to allow" - + * FModifier|FModifierLimits.use_maximum_x -> use_max_x: boolean "Use the maximum X value" - + * FModifier|FModifierLimits.use_maximum_y -> use_max_y: boolean "Use the maximum Y value" - + * FModifier|FModifierLimits.use_minimum_x -> use_min_x: boolean "Use the minimum X value" - + * FModifier|FModifierLimits.use_minimum_y -> use_min_y: boolean "Use the minimum Y value" +#FModifier|FModifierGenerator.use_additive -> use_additive: boolean "Values generated by this modifier are applied on top of the existing values instead of overwriting them" +#FModifier|FModifierLimits.max_x -> max_x: float "Highest X value to allow" +#FModifier|FModifierLimits.max_y -> max_y: float "Highest Y value to allow" +#FModifier|FModifierLimits.min_x -> min_x: float "Lowest X value to allow" +#FModifier|FModifierLimits.min_y -> min_y: float "Lowest Y value to allow" +#FModifier|FModifierLimits.use_max_x -> use_max_x: boolean "Use the maximum X value" +#FModifier|FModifierLimits.use_max_y -> use_max_y: boolean "Use the maximum Y value" +#FModifier|FModifierLimits.use_min_x -> use_min_x: boolean "Use the minimum X value" +#FModifier|FModifierLimits.use_min_y -> use_min_y: boolean "Use the minimum Y value" #FModifier|FModifierNoise.blend_type -> blend_type: enum "Method of modifying the existing F-Curve" #+ * FModifier|FModifierNoise.depth -> depth: int "Amount of fine level detail present in the noise" #+ * FModifier|FModifierNoise.phase -> phase: float "A random seed for the noise effect" #FModifier|FModifierNoise.scale -> scale: float "Scaling (in time) of the noise" #+ * FModifier|FModifierNoise.strength -> strength: float "Amplitude of the noise - the amount that it modifies the underlying curve" #+ * FModifier|FModifierStepped.frame_end -> frame_end: float "Frame that modifiers influence ends (if applicable)" - + * FModifier|FModifierStepped.offset -> frame_offset: float "Reference number of frames before frames get held. Use to get hold for 1-3 vs 5-7 holding patterns" +#FModifier|FModifierStepped.frame_offset -> frame_offset: float "Reference number of frames before frames get held. Use to get hold for 1-3 vs 5-7 holding patterns" #+ * FModifier|FModifierStepped.frame_start -> frame_start: float "Frame that modifiers influence starts (if applicable)" - + * FModifier|FModifierStepped.step_size -> frame_step: float "Number of frames to hold each value" +#FModifier|FModifierStepped.frame_step -> frame_step: float "Number of frames to hold each value" #+ * FModifier|FModifierStepped.use_frame_end -> use_frame_end: boolean "Restrict modifier to only act before its end frame" #+ * FModifier|FModifierStepped.use_frame_start -> use_frame_start: boolean "Restrict modifier to only act after its start frame" - + * FieldSettings.do_location -> apply_to_location: boolean "Effect particles location" - + * FieldSettings.do_rotation -> apply_to_rotation: boolean "Effect particles dynamic rotation" - + * FieldSettings.maximum_distance -> distance_max: float "Maximum distance for the field to work" - + * FieldSettings.minimum_distance -> distance_min: float "Minimum distance for the fields fall-off" +#FieldSettings.apply_to_location -> apply_to_location: boolean "Effect particles location" +#FieldSettings.apply_to_rotation -> apply_to_rotation: boolean "Effect particles dynamic rotation" +#FieldSettings.distance_max -> distance_max: float "Maximum distance for the field to work" +#FieldSettings.distance_min -> distance_min: float "Minimum distance for the fields fall-off" #+ * FieldSettings.falloff_power -> falloff_power: float "Falloff power (real gravitational falloff = 2)" #+ * FieldSettings.falloff_type -> falloff_type: enum "Fall-off shape" #+ * FieldSettings.flow -> flow: float "Convert effector force into air flow velocity" @@ -816,8 +816,8 @@ #+ * FieldSettings.noise -> noise: float "Noise of the force" #+ * FieldSettings.quadratic_drag -> quadratic_drag: float "Drag component proportional to the square of velocity" #+ * FieldSettings.radial_falloff -> radial_falloff: float "Radial falloff power (real gravitational falloff = 2)" - + * FieldSettings.radial_maximum -> radial_max: float "Maximum radial distance for the field to work" - + * FieldSettings.radial_minimum -> radial_min: float "Minimum radial distance for the fields fall-off" +#FieldSettings.radial_max -> radial_max: float "Maximum radial distance for the field to work" +#FieldSettings.radial_min -> radial_min: float "Minimum radial distance for the fields fall-off" #+ * FieldSettings.rest_length -> rest_length: float "Rest length of the harmonic force" #+ * FieldSettings.seed -> seed: int "Seed of the noise" #+ * FieldSettings.shape -> shape: enum "Which direction is used to calculate the effector force" @@ -827,18 +827,18 @@ #+ * FieldSettings.texture_mode -> texture_mode: enum "How the texture effect is calculated (RGB & Curl need a RGB texture else Gradient will be used instead)" #+ * FieldSettings.texture_nabla -> texture_nabla: float "Defines size of derivative offset used for calculating gradient and curl" #+ * FieldSettings.type -> type: enum "Type of field" - + * FieldSettings.force_2d -> use_2d_force: boolean "Apply force only in 2d" - + * FieldSettings.do_absorption -> use_absorption: boolean "Force gets absorbed by collision objects" - + * FieldSettings.global_coordinates -> use_global_coords: boolean "Use effector/global coordinates for turbulence" - + * FieldSettings.guide_path_add -> use_guide_path_add: boolean "Based on distance/falloff it adds a portion of the entire path" +#FieldSettings.use_2d_force -> use_2d_force: boolean "Apply force only in 2d" +#FieldSettings.use_absorption -> use_absorption: boolean "Force gets absorbed by collision objects" +#FieldSettings.use_global_coords -> use_global_coords: boolean "Use effector/global coordinates for turbulence" +#FieldSettings.use_guide_path_add -> use_guide_path_add: boolean "Based on distance/falloff it adds a portion of the entire path" #+ * FieldSettings.use_guide_path_weight -> use_guide_path_weight: boolean "Use curve weights to influence the particle influence along the curve" #+ * FieldSettings.use_max_distance -> use_max_distance: boolean "Use a maximum distance for the field to work" #+ * FieldSettings.use_min_distance -> use_min_distance: boolean "Use a minimum distance for the fields fall-off" - + * FieldSettings.multiple_springs -> use_multiple_springs: boolean "Every point is effected by multiple springs" - + * FieldSettings.use_coordinates -> use_object_coords: boolean "Use object/global coordinates for texture" +#FieldSettings.use_multiple_springs -> use_multiple_springs: boolean "Every point is effected by multiple springs" +#FieldSettings.use_object_coords -> use_object_coords: boolean "Use object/global coordinates for texture" #+ * FieldSettings.use_radial_max -> use_radial_max: boolean "Use a maximum radial distance for the field to work" #+ * FieldSettings.use_radial_min -> use_radial_min: boolean "Use a minimum radial distance for the fields fall-off" - + * FieldSettings.root_coordinates -> use_root_coords: boolean "Texture coordinates from root particle locations" +#FieldSettings.use_root_coords -> use_root_coords: boolean "Texture coordinates from root particle locations" #+ * FieldSettings.z_direction -> z_direction: enum "Effect in full or only positive/negative Z direction" #+ * FileSelectParams.directory -> directory: string "Directory displayed in the file browser" #FileSelectParams.display_type -> display_type: enum "Display mode for the file list" @@ -862,12 +862,12 @@ #+ * FluidSettings|ControlFluidSettings.quality -> quality: float "Specifies the quality which is used for object sampling. (higher = better but slower)" #+ * FluidSettings|ControlFluidSettings.start_time -> start_time: float "Specifies time when the control particles are activated" #FluidSettings|ControlFluidSettings.use -> use: boolean "Object contributes to the fluid simulation" - + * FluidSettings|ControlFluidSettings.reverse_frames -> use_reverse_frames: boolean "Reverse control object movement" +#FluidSettings|ControlFluidSettings.use_reverse_frames -> use_reverse_frames: boolean "Reverse control object movement" #+ * FluidSettings|ControlFluidSettings.velocity_radius -> velocity_radius: float "Specifies the force field radius around the control object" #+ * FluidSettings|ControlFluidSettings.velocity_strength -> velocity_strength: float "Force strength of how much of the control objects velocity is influencing the fluid velocity" #+ * FluidSettings|DomainFluidSettings.compressibility -> compressibility: float "Allowed compressibility due to gravitational force for standing fluid. (directly affects simulation step size)" #+ * FluidSettings|DomainFluidSettings.end_time -> end_time: float "Simulation time of the last blender frame (in seconds)" - + * FluidSettings|DomainFluidSettings.path -> filepath: string "Directory (and/or filename prefix) to store baked fluid simulation files in" +#FluidSettings|DomainFluidSettings.filepath -> filepath: string "Directory (and/or filename prefix) to store baked fluid simulation files in" #+ * FluidSettings|DomainFluidSettings.generate_particles -> generate_particles: float "Amount of particles to generate (0=off, 1=normal, >1=more)" #+ * FluidSettings|DomainFluidSettings.gravity -> gravity: float[3] "Gravity in X, Y and Z direction" #+ * FluidSettings|DomainFluidSettings.grid_levels -> grid_levels: int "Number of coarsened grids to use (-1 for automatic)" @@ -876,43 +876,43 @@ #+ * FluidSettings|DomainFluidSettings.preview_resolution -> preview_resolution: int "Preview resolution in X,Y and Z direction" #+ * FluidSettings|DomainFluidSettings.render_display_mode -> render_display_mode: enum "How to display the mesh for rendering" #+ * FluidSettings|DomainFluidSettings.resolution -> resolution: int "Domain resolution in X,Y and Z direction" - + * FluidSettings|DomainFluidSettings.real_world_size -> simulation_scale: float "Size of the simulation domain in metres" +#FluidSettings|DomainFluidSettings.simulation_scale -> simulation_scale: float "Size of the simulation domain in metres" #+ * FluidSettings|DomainFluidSettings.slip_type -> slip_type: enum "NO DESCRIPTION" #+ * FluidSettings|DomainFluidSettings.start_time -> start_time: float "Simulation time of the first blender frame (in seconds)" - + * FluidSettings|DomainFluidSettings.surface_smoothing -> surface_smooth: float "Amount of surface smoothing. A value of 0 is off, 1 is normal smoothing and more than 1 is extra smoothing" +#FluidSettings|DomainFluidSettings.surface_smooth -> surface_smooth: float "Amount of surface smoothing. A value of 0 is off, 1 is normal smoothing and more than 1 is extra smoothing" #+ * FluidSettings|DomainFluidSettings.surface_subdivisions -> surface_subdivisions: int "Number of isosurface subdivisions. This is necessary for the inclusion of particles into the surface generation. Warning - can lead to longer computation times!" #+ * FluidSettings|DomainFluidSettings.tracer_particles -> tracer_particles: int "Number of tracer particles to generate" - + * FluidSettings|DomainFluidSettings.reverse_frames -> use_reverse_frames: boolean "Reverse fluid frames" - + * FluidSettings|DomainFluidSettings.generate_speed_vectors -> use_speed_vectors: boolean "Generate speed vectors for vector blur" - + * FluidSettings|DomainFluidSettings.override_time -> use_time_override: boolean "Use a custom start and end time (in seconds) instead of the scenes timeline" +#FluidSettings|DomainFluidSettings.use_reverse_frames -> use_reverse_frames: boolean "Reverse fluid frames" +#FluidSettings|DomainFluidSettings.use_speed_vectors -> use_speed_vectors: boolean "Generate speed vectors for vector blur" +#FluidSettings|DomainFluidSettings.use_time_override -> use_time_override: boolean "Use a custom start and end time (in seconds) instead of the scenes timeline" #+ * FluidSettings|DomainFluidSettings.viewport_display_mode -> viewport_display_mode: enum "How to display the mesh in the viewport" #+ * FluidSettings|DomainFluidSettings.viscosity_base -> viscosity_base: float "Viscosity setting: value that is multiplied by 10 to the power of (exponent*-1)" #+ * FluidSettings|DomainFluidSettings.viscosity_exponent -> viscosity_exponent: int "Negative exponent for the viscosity value (to simplify entering small values e.g. 5*10^-6.)" #+ * FluidSettings|DomainFluidSettings.viscosity_preset -> viscosity_preset: enum "Set viscosity of the fluid to a preset value, or use manual input" #+ * FluidSettings|FluidFluidSettings.initial_velocity -> initial_velocity: float[3] "Initial velocity of fluid" #FluidSettings|FluidFluidSettings.use -> use: boolean "Object contributes to the fluid simulation" - + * FluidSettings|FluidFluidSettings.export_animated_mesh -> use_animated_mesh: boolean "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" +#FluidSettings|FluidFluidSettings.use_animated_mesh -> use_animated_mesh: boolean "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" #+ * FluidSettings|FluidFluidSettings.volume_initialization -> volume_initialization: enum "Volume initialization type" #+ * FluidSettings|InflowFluidSettings.inflow_velocity -> inflow_velocity: float[3] "Initial velocity of fluid" #FluidSettings|InflowFluidSettings.use -> use: boolean "Object contributes to the fluid simulation" - + * FluidSettings|InflowFluidSettings.export_animated_mesh -> use_animated_mesh: boolean "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" - + * FluidSettings|InflowFluidSettings.local_coordinates -> use_local_coords: boolean "Use local coordinates for inflow. (e.g. for rotating objects)" +#FluidSettings|InflowFluidSettings.use_animated_mesh -> use_animated_mesh: boolean "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" +#FluidSettings|InflowFluidSettings.use_local_coords -> use_local_coords: boolean "Use local coordinates for inflow. (e.g. for rotating objects)" #+ * FluidSettings|InflowFluidSettings.volume_initialization -> volume_initialization: enum "Volume initialization type" #+ * FluidSettings|ObstacleFluidSettings.impact_factor -> impact_factor: float "This is an unphysical value for moving objects - it controls the impact an obstacle has on the fluid, =0 behaves a bit like outflow (deleting fluid), =1 is default, while >1 results in high forces. Can be used to tweak total mass" #+ * FluidSettings|ObstacleFluidSettings.partial_slip_factor -> partial_slip_factor: float "Amount of mixing between no- and free-slip, 0 is no slip and 1 is free slip" #+ * FluidSettings|ObstacleFluidSettings.slip_type -> slip_type: enum "NO DESCRIPTION" #FluidSettings|ObstacleFluidSettings.use -> use: boolean "Object contributes to the fluid simulation" - + * FluidSettings|ObstacleFluidSettings.export_animated_mesh -> use_animated_mesh: boolean "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" +#FluidSettings|ObstacleFluidSettings.use_animated_mesh -> use_animated_mesh: boolean "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" #+ * FluidSettings|ObstacleFluidSettings.volume_initialization -> volume_initialization: enum "Volume initialization type" #FluidSettings|OutflowFluidSettings.use -> use: boolean "Object contributes to the fluid simulation" - + * FluidSettings|OutflowFluidSettings.export_animated_mesh -> use_animated_mesh: boolean "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" +#FluidSettings|OutflowFluidSettings.use_animated_mesh -> use_animated_mesh: boolean "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" #+ * FluidSettings|OutflowFluidSettings.volume_initialization -> volume_initialization: enum "Volume initialization type" #+ * FluidSettings|ParticleFluidSettings.alpha_influence -> alpha_influence: float "Amount of particle alpha change, inverse of size influence: 0=off (all same alpha), 1=full. (large particles get lower alphas, smaller ones higher values)" - + * FluidSettings|ParticleFluidSettings.path -> filepath: string "Directory (and/or filename prefix) to store and load particles from" +#FluidSettings|ParticleFluidSettings.filepath -> filepath: string "Directory (and/or filename prefix) to store and load particles from" #+ * FluidSettings|ParticleFluidSettings.particle_influence -> particle_influence: float "Amount of particle size scaling: 0=off (all same size), 1=full (range 0.2-2.0), >1=stronger" #FluidSettings|ParticleFluidSettings.show_tracer -> show_tracer: boolean "Show tracer particles" - + * FluidSettings|ParticleFluidSettings.drops -> use_drops: boolean "Show drop particles" - + * FluidSettings|ParticleFluidSettings.floats -> use_floats: boolean "Show floating foam particles" +#FluidSettings|ParticleFluidSettings.use_drops -> use_drops: boolean "Show drop particles" +#FluidSettings|ParticleFluidSettings.use_floats -> use_floats: boolean "Show floating foam particles" #+ * Function.description -> description: string, "(read-only) Description of the Functions purpose" #+ * Function.identifier -> identifier: string, "(read-only) Unique name used in the code and scripting" #Function.is_registered -> is_registered: boolean, "(read-only) Function is registered as callback as part of type registration" @@ -941,18 +941,18 @@ #+ * GPencilStrokePoint.co -> co: float[3] "NO DESCRIPTION" #+ * GPencilStrokePoint.pressure -> pressure: float "Pressure of tablet at point when drawing it" #+ * GameObjectSettings.actuators -> actuators: collection, "(read-only) Game engine actuators to act on events" - + * GameObjectSettings.collision_bounds -> collision_bounds_type: enum "Selects the collision type" +#GameObjectSettings.collision_bounds_type -> collision_bounds_type: enum "Selects the collision type" #+ * GameObjectSettings.collision_margin -> collision_margin: float "Extra margin around object for collision detection, small amount required for stability" #+ * GameObjectSettings.controllers -> controllers: collection, "(read-only) Game engine controllers to process events, connecting sensor to actuators" #+ * GameObjectSettings.damping -> damping: float "General movement damping" #+ * GameObjectSettings.form_factor -> form_factor: float "Form factor scales the inertia tensor" #+ * GameObjectSettings.friction_coefficients -> friction_coefficients: float[3] "Relative friction coefficient in the in the X, Y and Z directions, when anisotropic friction is enabled" - + * GameObjectSettings.lock_x_axis -> lock_location_x: boolean "Disable simulation of linear motion along the X axis" - + * GameObjectSettings.lock_y_axis -> lock_location_y: boolean "Disable simulation of linear motion along the Y axis" - + * GameObjectSettings.lock_z_axis -> lock_location_z: boolean "Disable simulation of linear motion along the Z axis" - + * GameObjectSettings.lock_x_rot_axis -> lock_rotation_x: boolean "Disable simulation of angular motion along the X axis" - + * GameObjectSettings.lock_y_rot_axis -> lock_rotation_y: boolean "Disable simulation of angular motion along the Y axis" - + * GameObjectSettings.lock_z_rot_axis -> lock_rotation_z: boolean "Disable simulation of angular motion along the Z axis" +#GameObjectSettings.lock_location_x -> lock_location_x: boolean "Disable simulation of linear motion along the X axis" +#GameObjectSettings.lock_location_y -> lock_location_y: boolean "Disable simulation of linear motion along the Y axis" +#GameObjectSettings.lock_location_z -> lock_location_z: boolean "Disable simulation of linear motion along the Z axis" +#GameObjectSettings.lock_rotation_x -> lock_rotation_x: boolean "Disable simulation of angular motion along the X axis" +#GameObjectSettings.lock_rotation_y -> lock_rotation_y: boolean "Disable simulation of angular motion along the Y axis" +#GameObjectSettings.lock_rotation_z -> lock_rotation_z: boolean "Disable simulation of angular motion along the Z axis" #+ * GameObjectSettings.mass -> mass: float "Mass of the object" #+ * GameObjectSettings.physics_type -> physics_type: enum "Selects the type of physical representation" #+ * GameObjectSettings.properties -> properties: collection, "(read-only) Game engine properties" @@ -965,23 +965,23 @@ #+ * GameObjectSettings.show_sensors -> show_sensors: boolean "Shows sensors for this object in the user interface" #+ * GameObjectSettings.show_state_panel -> show_state_panel: boolean "Show state panel" #+ * GameObjectSettings.soft_body -> soft_body: pointer, "(read-only) Settings for Bullet soft body simulation" - + * GameObjectSettings.initial_state -> states_initial: boolean[30] "Initial state when the game starts" - + * GameObjectSettings.visible_state -> states_visible: boolean[30] "State determining which controllers are displayed" +#GameObjectSettings.states_initial -> states_initial: boolean[30] "Initial state when the game starts" +#GameObjectSettings.states_visible -> states_visible: boolean[30] "State determining which controllers are displayed" #+ * GameObjectSettings.use_activity_culling -> use_activity_culling: boolean "Disable simulation of angular motion along the Z axis" #GameObjectSettings.use_actor -> use_actor: boolean "Object is detected by the Near and Radar sensor" - + * GameObjectSettings.all_states -> use_all_states: boolean "Set all state bits" - + * GameObjectSettings.anisotropic_friction -> use_anisotropic_friction: boolean "Enable anisotropic friction" +#GameObjectSettings.use_all_states -> use_all_states: boolean "Set all state bits" +#GameObjectSettings.use_anisotropic_friction -> use_anisotropic_friction: boolean "Enable anisotropic friction" #+ * GameObjectSettings.use_collision_bounds -> use_collision_bounds: boolean "Specify a collision bounds type other than the default" - + * GameObjectSettings.collision_compound -> use_collision_compound: boolean "Add children to form a compound collision object" +#GameObjectSettings.use_collision_compound -> use_collision_compound: boolean "Add children to form a compound collision object" #GameObjectSettings.use_ghost -> use_ghost: boolean "Object does not restitute collisions, like a ghost" - + * GameObjectSettings.material_physics -> use_material_physics: boolean "Use physics settings in materials" - + * GameObjectSettings.rotate_from_normal -> use_rotate_from_normal: boolean "Use face normal to rotate object, so that it points away from the surface" +#GameObjectSettings.use_material_physics -> use_material_physics: boolean "Use physics settings in materials" +#GameObjectSettings.use_rotate_from_normal -> use_rotate_from_normal: boolean "Use face normal to rotate object, so that it points away from the surface" #GameObjectSettings.use_sleep -> use_sleep: boolean "Disable auto (de)activation in physics simulation" #GameObjectSettings.used_states -> used_states: boolean[30], "(read-only) States which are being used by controllers" - + * GameObjectSettings.maximum_velocity -> velocity_max: float "Clamp velocity to this maximum speed" - + * GameObjectSettings.minimum_velocity -> velocity_min: float "Clamp velocity to this minimum speed (except when totally still)" +#GameObjectSettings.velocity_max -> velocity_max: float "Clamp velocity to this maximum speed" +#GameObjectSettings.velocity_min -> velocity_min: float "Clamp velocity to this minimum speed (except when totally still)" #+ * GameProperty.name -> name: string "Available as GameObject attributes in the game engines python API" - + * GameProperty.debug -> show_debug: boolean "Print debug information for this property" +#GameProperty.show_debug -> show_debug: boolean "Print debug information for this property" #+ * GameProperty.type -> type: enum "NO DESCRIPTION" #+ * GameProperty|GameBooleanProperty.value -> value: boolean "Property value" #+ * GameProperty|GameFloatProperty.value -> value: float "Property value" @@ -991,13 +991,13 @@ #+ * GameSoftBodySettings.cluster_iterations -> cluster_iterations: int "Specify the number of cluster iterations" #GameSoftBodySettings.collision_margin -> collision_margin: float "Collision margin for soft body. Small value makes the algorithm unstable" #+ * GameSoftBodySettings.dynamic_friction -> dynamic_friction: float "Dynamic Friction" - + * GameSoftBodySettings.linstiff -> linear_stiffness: float "Linear stiffness of the soft body links" - + * GameSoftBodySettings.position_iterations -> location_iterations: int "Position solver iterations" +#GameSoftBodySettings.linear_stiffness -> linear_stiffness: float "Linear stiffness of the soft body links" +#GameSoftBodySettings.location_iterations -> location_iterations: int "Position solver iterations" #GameSoftBodySettings.shape_threshold -> shape_threshold: float "Shape matching threshold" - + * GameSoftBodySettings.bending_const -> use_bending_constraints: boolean "Enable bending constraints" - + * GameSoftBodySettings.cluster_rigid_to_softbody -> use_cluster_rigid_to_softbody: boolean "Enable cluster collision between soft and rigid body" - + * GameSoftBodySettings.cluster_soft_to_softbody -> use_cluster_soft_to_softbody: boolean "Enable cluster collision between soft and soft body" - + * GameSoftBodySettings.shape_match -> use_shape_match: boolean "Enable soft body shape matching goal" +#GameSoftBodySettings.use_bending_constraints -> use_bending_constraints: boolean "Enable bending constraints" +#GameSoftBodySettings.use_cluster_rigid_to_softbody -> use_cluster_rigid_to_softbody: boolean "Enable cluster collision between soft and rigid body" +#GameSoftBodySettings.use_cluster_soft_to_softbody -> use_cluster_soft_to_softbody: boolean "Enable cluster collision between soft and soft body" +#GameSoftBodySettings.use_shape_match -> use_shape_match: boolean "Enable soft body shape matching goal" #GameSoftBodySettings.weld_threshold -> weld_threshold: float "Welding threshold: distance between nearby vertices to be considered equal => set to 0.0 to disable welding test and speed up scene loading (ok if the mesh has no duplicates)" #+ * Header.bl_idname -> bl_idname: string "If this is set, the header gets a custom ID, otherwise it takes the name of the class used to define the panel. For example, if the class name is OBJECT_HT_hello, and bl_idname is not set by the script, then bl_idname = OBJECT_HT_hello" #+ * Header.bl_space_type -> bl_space_type: enum "The space where the header is going to be used in." @@ -1034,11 +1034,11 @@ #+ * IDPropertyGroup|NetRenderSettings.server_port -> server_port: int "port of the master render server" #+ * IDPropertyGroup|NetRenderSettings.slaves -> slaves: collection, "(read-only)" #+ * IDPropertyGroup|NetRenderSettings.slaves_blacklist -> slaves_blacklist: collection, "(read-only)" - + * IDPropertyGroup|NetRenderSettings.master_broadcast -> use_master_broadcast: boolean "broadcast master server address on local network" - + * IDPropertyGroup|NetRenderSettings.master_clear -> use_master_clear: boolean "delete saved files on exit" - + * IDPropertyGroup|NetRenderSettings.slave_clear -> use_slave_clear: boolean "delete downloaded files on exit" - + * IDPropertyGroup|NetRenderSettings.slave_outputlog -> use_slave_output_log: boolean "Output render text log to console as well as sending it to the master" - + * IDPropertyGroup|NetRenderSettings.slave_thumb -> use_slave_thumb: boolean "Generate thumbnails on slaves instead of master" +#IDPropertyGroup|NetRenderSettings.use_master_broadcast -> use_master_broadcast: boolean "broadcast master server address on local network" +#IDPropertyGroup|NetRenderSettings.use_master_clear -> use_master_clear: boolean "delete saved files on exit" +#IDPropertyGroup|NetRenderSettings.use_slave_clear -> use_slave_clear: boolean "delete downloaded files on exit" +#IDPropertyGroup|NetRenderSettings.use_slave_output_log -> use_slave_output_log: boolean "Output render text log to console as well as sending it to the master" +#IDPropertyGroup|NetRenderSettings.use_slave_thumb -> use_slave_thumb: boolean "Generate thumbnails on slaves instead of master" #+ * IDPropertyGroup|NetRenderSlave.name -> name: string "NO DESCRIPTION" #+ * IDPropertyGroup|OperatorFileListElement.name -> name: string "the name of a file or directory within a file list" #+ * IDPropertyGroup|OperatorMousePath.loc -> loc: float[2] "Mouse location" @@ -1051,13 +1051,13 @@ #+ * IDPropertyGroup|PoseTemplate.name -> name: string "NO DESCRIPTION" #+ * IDPropertyGroup|PoseTemplateSettings.active_template_index -> active_template_index: int "NO DESCRIPTION" #+ * IDPropertyGroup|PoseTemplateSettings.templates -> templates: collection, "(read-only)" - + * IDPropertyGroup|PoseTemplateSettings.generate_def_rig -> use_generate_deform_rig: boolean "Create a copy of the metarig, constrainted by the generated rig" +#IDPropertyGroup|PoseTemplateSettings.use_generate_deform_rig -> use_generate_deform_rig: boolean "Create a copy of the metarig, constrainted by the generated rig" #+ * ID|Action.fcurves -> fcurves: collection, "(read-only) The individual F-Curves that make up the Action" #+ * ID|Action.groups -> groups: collection, "(read-only) Convenient groupings of F-Curves" #+ * ID|Action.pose_markers -> pose_markers: collection, "(read-only) Markers specific to this Action, for labeling poses" #+ * ID|Armature.animation_data -> animation_data: pointer, "(read-only) Animation data for this datablock" #+ * ID|Armature.bones -> bones: collection, "(read-only)" - + * ID|Armature.drawtype -> draw_type: enum "NO DESCRIPTION" +#ID|Armature.draw_type -> draw_type: enum "NO DESCRIPTION" #+ * ID|Armature.edit_bones -> edit_bones: collection, "(read-only)" #+ * ID|Armature.ghost_frame_end -> ghost_frame_end: int "End frame of range of Ghosts to display (not for Around Current Frame Onion-skinning method)" #+ * ID|Armature.ghost_frame_start -> ghost_frame_start: int "Starting frame of range of Ghosts to display (not for Around Current Frame Onion-skinning method)" @@ -1065,19 +1065,19 @@ #+ * ID|Armature.ghost_step -> ghost_step: int "Number of frame steps on either side of current frame to show as ghosts (only for Around Current Frame Onion-skinning method)" #+ * ID|Armature.ghost_type -> ghost_type: enum "Method of Onion-skinning for active Action" #ID|Armature.layers -> layers: boolean[32] "Armature layer visibility" - + * ID|Armature.layer_protection -> layers_protected: boolean[32] "Protected layers in Proxy Instances are restored to Proxy settings on file reload and undo" +#ID|Armature.layers_protected -> layers_protected: boolean[32] "Protected layers in Proxy Instances are restored to Proxy settings on file reload and undo" #+ * ID|Armature.pose_position -> pose_position: enum "Show armature in binding pose or final posed state" #ID|Armature.show_axes -> show_axes: boolean "Draw bone axes" #ID|Armature.show_bone_custom_shapes -> show_bone_custom_shapes: boolean "Draw bones with their custom shapes" #ID|Armature.show_group_colors -> show_group_colors: boolean "Draw bone group colors" #ID|Armature.show_names -> show_names: boolean "Draw bone names" #ID|Armature.show_only_ghost_selected -> show_only_ghost_selected: boolean "NO DESCRIPTION" - + * ID|Armature.auto_ik -> use_auto_ik: boolean "Add temporaral IK constraints while grabbing bones in Pose Mode" - + * ID|Armature.delay_deform -> use_deform_delay: boolean "Dont deform children when manipulating bones in Pose Mode" - + * ID|Armature.deform_envelope -> use_deform_envelopes: boolean "Enable Bone Envelopes when defining deform" - + * ID|Armature.deform_quaternion -> use_deform_preserve_volume: boolean "Enable deform rotation with Quaternions" - + * ID|Armature.deform_vertexgroups -> use_deform_vertex_groups: boolean "Enable Vertex Groups when defining deform" - + * ID|Armature.x_axis_mirror -> use_mirror_x: boolean "Apply changes to matching bone on opposite side of X-Axis" +#ID|Armature.use_auto_ik -> use_auto_ik: boolean "Add temporaral IK constraints while grabbing bones in Pose Mode" +#ID|Armature.use_deform_delay -> use_deform_delay: boolean "Dont deform children when manipulating bones in Pose Mode" +#ID|Armature.use_deform_envelopes -> use_deform_envelopes: boolean "Enable Bone Envelopes when defining deform" +#ID|Armature.use_deform_preserve_volume -> use_deform_preserve_volume: boolean "Enable deform rotation with Quaternions" +#ID|Armature.use_deform_vertex_groups -> use_deform_vertex_groups: boolean "Enable Vertex Groups when defining deform" +#ID|Armature.use_mirror_x -> use_mirror_x: boolean "Apply changes to matching bone on opposite side of X-Axis" #ID|Brush.auto_smooth_factor -> auto_smooth_factor: float "Amount of smoothing to automatically apply to each stroke" #+ * ID|Brush.blend -> blend: enum "Brush blending mode" #+ * ID|Brush.clone_alpha -> clone_alpha: float "Opacity of clone image display" @@ -1101,7 +1101,7 @@ #+ * ID|Brush.size -> size: int "Radius of the brush in pixels" #+ * ID|Brush.smooth_stroke_factor -> smooth_stroke_factor: float "Higher values give a smoother stroke" #+ * ID|Brush.smooth_stroke_radius -> smooth_stroke_radius: int "Minimum distance from last point before stroke continues" -#+ * ID|Brush.spacing -> spacing: int "Spacing between brush daubs as a percentage of brush diameter" +#ID|Brush.spacing -> spacing: int "Spacing between brush daubs as a percentage of brush diameter" #+ * ID|Brush.strength -> strength: float "How powerful the effect of the brush is when applied" #+ * ID|Brush.stroke_method -> stroke_method: enum "NO DESCRIPTION" #+ * ID|Brush.texture -> texture: pointer "NO DESCRIPTION" @@ -1170,8 +1170,8 @@ #+ * ID|Curve.eval_time -> eval_time: float "Parametric position along the length of the curve that Objects following it should be at. Position is evaluated by dividing by the Path Length value" #+ * ID|Curve.extrude -> extrude: float "Amount of curve extrusion when not using a bevel object" #+ * ID|Curve.materials -> materials: collection, "(read-only)" - + * ID|Curve.width -> offset: float "Scale the original width (1.0) based on given factor" - + * ID|Curve.path_length -> path_duration: int "The number of frames that are needed to traverse the path, defining the maximum value for the Evaluation Time setting" +#ID|Curve.offset -> offset: float "Scale the original width (1.0) based on given factor" +#ID|Curve.path_duration -> path_duration: int "The number of frames that are needed to traverse the path, defining the maximum value for the Evaluation Time setting" #+ * ID|Curve.render_resolution_u -> render_resolution_u: int "Surface resolution in U direction used while rendering. Zero skips this property" #+ * ID|Curve.render_resolution_v -> render_resolution_v: int "Surface resolution in V direction used while rendering. Zero skips this property" #+ * ID|Curve.resolution_u -> resolution_u: int "Surface resolution in U direction" @@ -1181,24 +1181,24 @@ #ID|Curve.show_normal_face -> show_normal_face: boolean "Display 3D curve normals in editmode" #+ * ID|Curve.splines -> splines: collection, "(read-only) Collection of splines in this curve data object" #+ * ID|Curve.taper_object -> taper_object: pointer "Curve object name that defines the taper (width)" - ID|Curve.texspace_loc -> texspace_location: float[3] "Texture space location" +#ID|Curve.texspace_location -> texspace_location: float[3] "Texture space location" #+ * ID|Curve.texspace_size -> texspace_size: float[3] "Texture space size" #+ * ID|Curve.twist_mode -> twist_mode: enum "The type of tilt calculation for 3D Curves" #+ * ID|Curve.twist_smooth -> twist_smooth: float "Smoothing iteration for tangents" - + * ID|Curve.auto_texspace -> use_auto_texspace: boolean "Adjusts active objects texture space automatically when transforming object" +#ID|Curve.use_auto_texspace -> use_auto_texspace: boolean "Adjusts active objects texture space automatically when transforming object" #+ * ID|Curve.use_deform_bounds -> use_deform_bounds: boolean "Use the mesh bounds to clamp the deformation" - + * ID|Curve.back -> use_fill_back: boolean "Draw filled back for extruded/beveled curves" - + * ID|Curve.use_deform_fill -> use_fill_deform: boolean "Fill curve after applying deformation" - + * ID|Curve.front -> use_fill_front: boolean "Draw filled front for extruded/beveled curves" - + * ID|Curve.map_along_length -> use_map_on_length: boolean "Generate texture mapping coordinates following the curve direction, rather than the local bounding box" +#ID|Curve.use_fill_back -> use_fill_back: boolean "Draw filled back for extruded/beveled curves" +#ID|Curve.use_fill_deform -> use_fill_deform: boolean "Fill curve after applying deformation" +#ID|Curve.use_fill_front -> use_fill_front: boolean "Draw filled front for extruded/beveled curves" +#ID|Curve.use_map_on_length -> use_map_on_length: boolean "Generate texture mapping coordinates following the curve direction, rather than the local bounding box" #+ * ID|Curve.use_path -> use_path: boolean "Enable the curve to become a translation path" #+ * ID|Curve.use_path_follow -> use_path_follow: boolean "Make curve path children to rotate along the path" #+ * ID|Curve.use_radius -> use_radius: boolean "Option for paths: apply the curve radius with path following it and deforming" #+ * ID|Curve.use_stretch -> use_stretch: boolean "Option for curve-deform: makes deformed child to stretch along entire path" #+ * ID|Curve.use_time_offset -> use_time_offset: boolean "Children will use TimeOffs value as path distance offset" - + * ID|Curve|SurfaceCurve.map_along_length -> use_map_on_length: boolean "Generate texture mapping coordinates following the curve direction, rather than the local bounding box" +#ID|Curve|SurfaceCurve.use_map_on_length -> use_map_on_length: boolean "Generate texture mapping coordinates following the curve direction, rather than the local bounding box" #MAKE COLLECTION ATTR * ID|Curve|TextCurve.active_textbox -> active_textbox: int "NO DESCRIPTION" - + * ID|Curve|TextCurve.spacemode -> align: enum "Text align from the object center" +#ID|Curve|TextCurve.align -> align: enum "Text align from the object center" #+ * ID|Curve|TextCurve.body -> body: string "contents of this text object" #+ * ID|Curve|TextCurve.body_format -> body_format: collection, "(read-only) Stores the style of each character" #+ * ID|Curve|TextCurve.edit_format -> edit_format: pointer, "(read-only) Editing settings character formatting" @@ -1208,16 +1208,16 @@ #+ * ID|Curve|TextCurve.offset_x -> offset_x: float "Horizontal offset from the object origin" #+ * ID|Curve|TextCurve.offset_y -> offset_y: float "Vertical offset from the object origin" #+ * ID|Curve|TextCurve.shear -> shear: float "Italic angle of the characters" - + * ID|Curve|TextCurve.text_size -> size: float "NO DESCRIPTION" +#ID|Curve|TextCurve.size -> size: float "NO DESCRIPTION" #+ * ID|Curve|TextCurve.small_caps_scale -> small_caps_scale: float "Scale of small capitals" - + * ID|Curve|TextCurve.spacing -> space_character: float "NO DESCRIPTION" - + * ID|Curve|TextCurve.line_dist -> space_line: float "NO DESCRIPTION" - + * ID|Curve|TextCurve.word_spacing -> space_word: float "NO DESCRIPTION" +#ID|Curve|TextCurve.space_character -> space_character: float "NO DESCRIPTION" +#ID|Curve|TextCurve.space_line -> space_line: float "NO DESCRIPTION" +#ID|Curve|TextCurve.space_word -> space_word: float "NO DESCRIPTION" #ID|Curve|TextCurve.text_boxes -> text_boxes: collection, "(read-only)" - + * ID|Curve|TextCurve.ul_height -> underline_height: float "NO DESCRIPTION" - + * ID|Curve|TextCurve.ul_position -> underline_position: float "Vertical position of underline" - + * ID|Curve|TextCurve.fast -> use_fast_edit: boolean "Dont fill polygons while editing" - + * ID|Curve|TextCurve.map_along_length -> use_map_on_length: boolean "Generate texture mapping coordinates following the curve direction, rather than the local bounding box" +#ID|Curve|TextCurve.underline_height -> underline_height: float "NO DESCRIPTION" +#ID|Curve|TextCurve.underline_position -> underline_position: float "Vertical position of underline" +#ID|Curve|TextCurve.use_fast_edit -> use_fast_edit: boolean "Dont fill polygons while editing" +#ID|Curve|TextCurve.use_map_on_length -> use_map_on_length: boolean "Generate texture mapping coordinates following the curve direction, rather than the local bounding box" #+ * ID|GreasePencil.draw_mode -> draw_mode: enum "NO DESCRIPTION" #+ * ID|GreasePencil.layers -> layers: collection, "(read-only)" #+ * ID|GreasePencil.use_stroke_endpoints -> use_stroke_endpoints: boolean "Only use the first and last parts of the stroke for snapping" @@ -1231,9 +1231,9 @@ #+ * ID|Image.file_format -> file_format: enum "Format used for re-saving this file" #+ * ID|Image.filepath -> filepath: string "Image/Movie file name" #+ * ID|Image.filepath_raw -> filepath_raw: string "Image/Movie file name (without data refreshing)" - + * ID|Image.animation_speed -> fps: int "Speed of the animation in frames per second" - + * ID|Image.animation_end -> frame_end: int "End frame of an animated texture" - + * ID|Image.animation_start -> frame_start: int "Start frame of an animated texture" +#ID|Image.fps -> fps: int "Speed of the animation in frames per second" +#ID|Image.frame_end -> frame_end: int "End frame of an animated texture" +#ID|Image.frame_start -> frame_start: int "Start frame of an animated texture" #+ * ID|Image.generated_height -> generated_height: int "Generated image height" #+ * ID|Image.generated_type -> generated_type: enum "Generated image type" #+ * ID|Image.generated_width -> generated_width: int "Generated image width" @@ -1246,12 +1246,12 @@ #+ * ID|Image.tiles_x -> tiles_x: int "Degree of repetition in the X direction" #+ * ID|Image.tiles_y -> tiles_y: int "Degree of repetition in the Y direction" #+ * ID|Image.type -> type: enum, "(read-only) How to generate the image" - + * ID|Image.animated -> use_animation: boolean "Use as animated texture in the game engine" - + * ID|Image.clamp_x -> use_clamp_x: boolean "Disable texture repeating horizontally" - + * ID|Image.clamp_y -> use_clamp_y: boolean "Disable texture repeating vertically" +#ID|Image.use_animation -> use_animation: boolean "Use as animated texture in the game engine" +#ID|Image.use_clamp_x -> use_clamp_x: boolean "Disable texture repeating horizontally" +#ID|Image.use_clamp_y -> use_clamp_y: boolean "Disable texture repeating vertically" #ID|Image.use_fields -> use_fields: boolean "Use fields of the image" - + * ID|Image.premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" - + * ID|Image.tiles -> use_tiles: boolean "Use of tilemode for faces (default shift-LMB to pick the tile for selected faces)" +#ID|Image.use_premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" +#ID|Image.use_tiles -> use_tiles: boolean "Use of tilemode for faces (default shift-LMB to pick the tile for selected faces)" #+ * ID|Key.animation_data -> animation_data: pointer, "(read-only) Animation data for this datablock" #+ * ID|Key.keys -> keys: collection, "(read-only) Shape keys" #+ * ID|Key.reference_key -> reference_key: pointer, "(read-only)" @@ -1266,26 +1266,26 @@ #+ * ID|Lamp.energy -> energy: float "Amount of light that the lamp emits" #+ * ID|Lamp.texture_slots -> texture_slots: collection, "(read-only) Texture slots defining the mapping and influence of textures" #+ * ID|Lamp.type -> type: enum "Type of Lamp" - + * ID|Lamp.diffuse -> use_diffuse: boolean "Lamp does diffuse shading" - + * ID|Lamp.negative -> use_negative: boolean "Lamp casts negative light" - + * ID|Lamp.layer -> use_own_layer: boolean "Illuminates objects only on the same layer the lamp is on" - + * ID|Lamp.specular -> use_specular: boolean "Lamp creates specular highlights" +#ID|Lamp.use_diffuse -> use_diffuse: boolean "Lamp does diffuse shading" +#ID|Lamp.use_negative -> use_negative: boolean "Lamp casts negative light" +#ID|Lamp.use_own_layer -> use_own_layer: boolean "Illuminates objects only on the same layer the lamp is on" +#ID|Lamp.use_specular -> use_specular: boolean "Lamp creates specular highlights" #+ * ID|Lamp|AreaLamp.gamma -> gamma: float "Light gamma correction value" #+ * ID|Lamp|AreaLamp.shadow_adaptive_threshold -> shadow_adaptive_threshold: float "Threshold for Adaptive Sampling (Raytraced shadows)" #+ * ID|Lamp|AreaLamp.shadow_color -> shadow_color: float[3] "Color of shadows cast by the lamp" #+ * ID|Lamp|AreaLamp.shadow_method -> shadow_method: enum "Method to compute lamp shadow with" - + * ID|Lamp|AreaLamp.shadow_ray_sampling_method -> shadow_ray_sample_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" +#ID|Lamp|AreaLamp.shadow_ray_sample_method -> shadow_ray_sample_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" #+ * ID|Lamp|AreaLamp.shadow_ray_samples_x -> shadow_ray_samples_x: int "Amount of samples taken extra (samples x samples)" #+ * ID|Lamp|AreaLamp.shadow_ray_samples_y -> shadow_ray_samples_y: int "Amount of samples taken extra (samples x samples)" #+ * ID|Lamp|AreaLamp.shadow_soft_size -> shadow_soft_size: float "Light size for ray shadow sampling (Raytraced shadows)" #+ * ID|Lamp|AreaLamp.shape -> shape: enum "Shape of the area lamp" #+ * ID|Lamp|AreaLamp.size -> size: float "Size of the area of the area Lamp, X direction size for Rectangle shapes" #+ * ID|Lamp|AreaLamp.size_y -> size_y: float "Size of the area of the area Lamp in the Y direction for Rectangle shapes" - + * ID|Lamp|AreaLamp.dither -> use_dither: boolean "Use 2x2 dithering for sampling (Constant Jittered sampling)" - + * ID|Lamp|AreaLamp.jitter -> use_jitter: boolean "Use noise for sampling (Constant Jittered sampling)" - + * ID|Lamp|AreaLamp.only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" - + * ID|Lamp|AreaLamp.shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" - + * ID|Lamp|AreaLamp.umbra -> use_umbra: boolean "Emphasize parts that are fully shadowed (Constant Jittered sampling)" +#ID|Lamp|AreaLamp.use_dither -> use_dither: boolean "Use 2x2 dithering for sampling (Constant Jittered sampling)" +#ID|Lamp|AreaLamp.use_jitter -> use_jitter: boolean "Use noise for sampling (Constant Jittered sampling)" +#ID|Lamp|AreaLamp.use_only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" +#ID|Lamp|AreaLamp.use_shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" +#ID|Lamp|AreaLamp.use_umbra -> use_umbra: boolean "Emphasize parts that are fully shadowed (Constant Jittered sampling)" #+ * ID|Lamp|PointLamp.falloff_curve -> falloff_curve: pointer, "(read-only) Custom Lamp Falloff Curve" #+ * ID|Lamp|PointLamp.falloff_type -> falloff_type: enum "Intensity Decay with distance" #+ * ID|Lamp|PointLamp.linear_attenuation -> linear_attenuation: float "Linear distance attenuation" @@ -1293,12 +1293,12 @@ #+ * ID|Lamp|PointLamp.shadow_adaptive_threshold -> shadow_adaptive_threshold: float "Threshold for Adaptive Sampling (Raytraced shadows)" #+ * ID|Lamp|PointLamp.shadow_color -> shadow_color: float[3] "Color of shadows cast by the lamp" #+ * ID|Lamp|PointLamp.shadow_method -> shadow_method: enum "Method to compute lamp shadow with" - + * ID|Lamp|PointLamp.shadow_ray_sampling_method -> shadow_ray_sample_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" +#ID|Lamp|PointLamp.shadow_ray_sample_method -> shadow_ray_sample_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" #+ * ID|Lamp|PointLamp.shadow_ray_samples -> shadow_ray_samples: int "Amount of samples taken extra (samples x samples)" #+ * ID|Lamp|PointLamp.shadow_soft_size -> shadow_soft_size: float "Light size for ray shadow sampling (Raytraced shadows)" - + * ID|Lamp|PointLamp.only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" - + * ID|Lamp|PointLamp.shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" - + * ID|Lamp|PointLamp.sphere -> use_sphere: boolean "Sets light intensity to zero beyond lamp distance" +#ID|Lamp|PointLamp.use_only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" +#ID|Lamp|PointLamp.use_shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" +#ID|Lamp|PointLamp.use_sphere -> use_sphere: boolean "Sets light intensity to zero beyond lamp distance" #+ * ID|Lamp|SpotLamp.compression_threshold -> compression_threshold: float "Deep shadow map compression threshold" #+ * ID|Lamp|SpotLamp.falloff_curve -> falloff_curve: pointer, "(read-only) Custom Lamp Falloff Curve" #+ * ID|Lamp|SpotLamp.falloff_type -> falloff_type: enum "Intensity Decay with distance" @@ -1317,29 +1317,29 @@ #+ * ID|Lamp|SpotLamp.shadow_color -> shadow_color: float[3] "Color of shadows cast by the lamp" #+ * ID|Lamp|SpotLamp.shadow_filter_type -> shadow_filter_type: enum "Type of shadow filter (Buffer Shadows)" #+ * ID|Lamp|SpotLamp.shadow_method -> shadow_method: enum "Method to compute lamp shadow with" - + * ID|Lamp|SpotLamp.shadow_ray_sampling_method -> shadow_ray_sample_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" +#ID|Lamp|SpotLamp.shadow_ray_sample_method -> shadow_ray_sample_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" #+ * ID|Lamp|SpotLamp.shadow_ray_samples -> shadow_ray_samples: int "Amount of samples taken extra (samples x samples)" #+ * ID|Lamp|SpotLamp.shadow_sample_buffers -> shadow_sample_buffers: enum "Number of shadow buffers to render for better AA, this increases memory usage" #+ * ID|Lamp|SpotLamp.shadow_soft_size -> shadow_soft_size: float "Light size for ray shadow sampling (Raytraced shadows)" #+ * ID|Lamp|SpotLamp.show_cone -> show_cone: boolean "Draw transparent cone in 3D view to visualize which objects are contained in it" #+ * ID|Lamp|SpotLamp.spot_blend -> spot_blend: float "The softness of the spotlight edge" #+ * ID|Lamp|SpotLamp.spot_size -> spot_size: float "Angle of the spotlight beam in degrees" - + * ID|Lamp|SpotLamp.auto_clip_end -> use_auto_clip_end: boolean "Automatic calculation of clipping-end, based on visible vertices" - + * ID|Lamp|SpotLamp.auto_clip_start -> use_auto_clip_start: boolean "Automatic calculation of clipping-start, based on visible vertices" - + * ID|Lamp|SpotLamp.halo -> use_halo: boolean "Renders spotlight with a volumetric halo (Buffer Shadows)" - + * ID|Lamp|SpotLamp.only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" - + * ID|Lamp|SpotLamp.shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" - + * ID|Lamp|SpotLamp.sphere -> use_sphere: boolean "Sets light intensity to zero beyond lamp distance" - + * ID|Lamp|SpotLamp.square -> use_square: boolean "Casts a square spot light shape" +#ID|Lamp|SpotLamp.use_auto_clip_end -> use_auto_clip_end: boolean "Automatic calculation of clipping-end, based on visible vertices" +#ID|Lamp|SpotLamp.use_auto_clip_start -> use_auto_clip_start: boolean "Automatic calculation of clipping-start, based on visible vertices" +#ID|Lamp|SpotLamp.use_halo -> use_halo: boolean "Renders spotlight with a volumetric halo (Buffer Shadows)" +#ID|Lamp|SpotLamp.use_only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" +#ID|Lamp|SpotLamp.use_shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" +#ID|Lamp|SpotLamp.use_sphere -> use_sphere: boolean "Sets light intensity to zero beyond lamp distance" +#ID|Lamp|SpotLamp.use_square -> use_square: boolean "Casts a square spot light shape" #+ * ID|Lamp|SunLamp.shadow_adaptive_threshold -> shadow_adaptive_threshold: float "Threshold for Adaptive Sampling (Raytraced shadows)" #+ * ID|Lamp|SunLamp.shadow_color -> shadow_color: float[3] "Color of shadows cast by the lamp" #+ * ID|Lamp|SunLamp.shadow_method -> shadow_method: enum "Method to compute lamp shadow with" +#ID|Lamp|SunLamp.shadow_ray_sample_method -> shadow_ray_sample_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" #+ * ID|Lamp|SunLamp.shadow_ray_samples -> shadow_ray_samples: int "Amount of samples taken extra (samples x samples)" -#+ * ID|Lamp|SunLamp.shadow_ray_sampling_method -> shadow_ray_sampling_method: enum "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower" #+ * ID|Lamp|SunLamp.shadow_soft_size -> shadow_soft_size: float "Light size for ray shadow sampling (Raytraced shadows)" #+ * ID|Lamp|SunLamp.sky -> sky: pointer, "(read-only) Sky related settings for sun lamps" - + * ID|Lamp|SunLamp.only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" - + * ID|Lamp|SunLamp.shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" +#ID|Lamp|SunLamp.use_only_shadow -> use_only_shadow: boolean "Causes light to cast shadows only without illuminating objects" +#ID|Lamp|SunLamp.use_shadow_layer -> use_shadow_layer: boolean "Causes only objects on the same layer to cast shadows" #+ * ID|Lattice.interpolation_type_u -> interpolation_type_u: enum "NO DESCRIPTION" #+ * ID|Lattice.interpolation_type_v -> interpolation_type_v: enum "NO DESCRIPTION" #+ * ID|Lattice.interpolation_type_w -> interpolation_type_w: enum "NO DESCRIPTION" @@ -1376,14 +1376,14 @@ #+ * ID|Material.light_group -> light_group: pointer "Limit lighting to lamps in this Group" #+ * ID|Material.mirror_color -> mirror_color: float[3] "Mirror color of the material" #+ * ID|Material.node_tree -> node_tree: pointer, "(read-only) Node tree for node based materials" - + * ID|Material.z_offset -> offset_z: float "Gives faces an artificial offset in the Z buffer for Z transparency" +#ID|Material.offset_z -> offset_z: float "Gives faces an artificial offset in the Z buffer for Z transparency" #+ * ID|Material.physics -> physics: pointer, "(read-only) Game physics settings" #+ * ID|Material.preview_render_type -> preview_render_type: enum "Type of preview render" #+ * ID|Material.raytrace_mirror -> raytrace_mirror: pointer, "(read-only) Raytraced reflection settings for the material" #+ * ID|Material.raytrace_transparency -> raytrace_transparency: pointer, "(read-only) Raytraced transparency settings for the material" #+ * ID|Material.roughness -> roughness: float "Oren-Nayar Roughness" #+ * ID|Material.shadow_buffer_bias -> shadow_buffer_bias: float "Factor to multiply shadow buffer bias with (0 is ignore.)" - + * ID|Material.shadow_casting_alpha -> shadow_cast_alpha: float "Shadow casting alpha, in use for Irregular and Deep shadow buffer" +#ID|Material.shadow_cast_alpha -> shadow_cast_alpha: float "Shadow casting alpha, in use for Irregular and Deep shadow buffer" #+ * ID|Material.shadow_ray_bias -> shadow_ray_bias: float "Shadow raytracing bias to prevent terminator problems on shadow boundary" #+ * ID|Material.specular_alpha -> specular_alpha: float "Alpha transparency for specular areas" #+ * ID|Material.specular_color -> specular_color: float[3] "Specular color of the material" @@ -1404,38 +1404,38 @@ #+ * ID|Material.translucency -> translucency: float "Amount of diffuse shading on the back side" #+ * ID|Material.transparency_method -> transparency_method: enum "Method to use for rendering transparency" #+ * ID|Material.type -> type: enum "Material type defining how the object is rendered" - + * ID|Material.cast_approximate -> use_cast_approximate: boolean "Allow this material to cast shadows when using approximate ambient occlusion." - + * ID|Material.cast_buffer_shadows -> use_cast_buffer_shadows: boolean "Allow this material to cast shadows from shadow buffer lamps" - + * ID|Material.cast_shadows_only -> use_cast_shadows_only: boolean "Makes objects with this material appear invisible, only casting shadows (not rendered)" - + * ID|Material.cubic -> use_cubic: boolean "Use cubic interpolation for diffuse values, for smoother transitions" +#ID|Material.use_cast_approximate -> use_cast_approximate: boolean "Allow this material to cast shadows when using approximate ambient occlusion." +#ID|Material.use_cast_buffer_shadows -> use_cast_buffer_shadows: boolean "Allow this material to cast shadows from shadow buffer lamps" +#ID|Material.use_cast_shadows_only -> use_cast_shadows_only: boolean "Makes objects with this material appear invisible, only casting shadows (not rendered)" +#ID|Material.use_cubic -> use_cubic: boolean "Use cubic interpolation for diffuse values, for smoother transitions" #+ * ID|Material.use_diffuse_ramp -> use_diffuse_ramp: boolean "Toggle diffuse ramp operations" - + * ID|Material.face_texture -> use_face_texture: boolean "Replaces the objects base color with color from face assigned image textures" - + * ID|Material.face_texture_alpha -> use_face_texture_alpha: boolean "Replaces the objects base alpha value with alpha from face assigned image textures" - + * ID|Material.full_oversampling -> use_full_oversampling: boolean "Force this material to render full shading/textures for all anti-aliasing samples" - + * ID|Material.light_group_exclusive -> use_light_group_exclusive: boolean "Material uses the light group exclusively - these lamps are excluded from other scene lighting" - +NEGATE * ID|Material.exclude_mist -> use_mist: boolean "Excludes this material from mist effects (in world settings)" +#ID|Material.use_face_texture -> use_face_texture: boolean "Replaces the objects base color with color from face assigned image textures" +#ID|Material.use_face_texture_alpha -> use_face_texture_alpha: boolean "Replaces the objects base alpha value with alpha from face assigned image textures" +#ID|Material.use_full_oversampling -> use_full_oversampling: boolean "Force this material to render full shading/textures for all anti-aliasing samples" +#ID|Material.use_light_group_exclusive -> use_light_group_exclusive: boolean "Material uses the light group exclusively - these lamps are excluded from other scene lighting" +#ID|Material.use_mist -> use_mist: boolean "Use mist with this material (in world settings)" #+ * ID|Material.use_nodes -> use_nodes: boolean "Use shader nodes to render the material" - + * ID|Material.object_color -> use_object_color: boolean "Modulate the result with a per-object color" - + * ID|Material.only_shadow -> use_only_shadow: boolean "Renders shadows as the materials alpha value, making materials transparent except for shadowed areas" - + * ID|Material.ray_shadow_bias -> use_ray_shadow_bias: boolean "Prevents raytraced shadow errors on surfaces with smooth shaded normals (terminator problem)" - + * ID|Material.traceable -> use_raytrace: boolean "Include this material and geometry that uses it in ray tracing calculations" - + * ID|Material.shadeless -> use_shadeless: boolean "Makes this material insensitive to light or shadow" - + * ID|Material.shadows -> use_shadows: boolean "Allows this material to receive shadows" +#ID|Material.use_object_color -> use_object_color: boolean "Modulate the result with a per-object color" +#ID|Material.use_only_shadow -> use_only_shadow: boolean "Renders shadows as the materials alpha value, making materials transparent except for shadowed areas" +#ID|Material.use_ray_shadow_bias -> use_ray_shadow_bias: boolean "Prevents raytraced shadow errors on surfaces with smooth shaded normals (terminator problem)" +#ID|Material.use_raytrace -> use_raytrace: boolean "Include this material and geometry that uses it in ray tracing calculations" +#ID|Material.use_shadeless -> use_shadeless: boolean "Makes this material insensitive to light or shadow" +#ID|Material.use_shadows -> use_shadows: boolean "Allows this material to receive shadows" #+ * ID|Material.use_sky -> use_sky: boolean "Renders this material with zero alpha, with sky background in place (scanline only)" #+ * ID|Material.use_specular_ramp -> use_specular_ramp: boolean "Toggle specular ramp operations" - + * ID|Material.tangent_shading -> use_tangent_shading: boolean "Use the materials tangent vector instead of the normal for shading - for anisotropic shading effects" +#ID|Material.use_tangent_shading -> use_tangent_shading: boolean "Use the materials tangent vector instead of the normal for shading - for anisotropic shading effects" #+ * ID|Material.use_textures -> use_textures: boolean[18] "Enable/Disable each texture" - + * ID|Material.transparency -> use_transparency: boolean "Render material as transparent" - + * ID|Material.receive_transparent_shadows -> use_transparent_shadows: boolean "Allow this object to receive transparent shadows casted through other objects" - + * ID|Material.vertex_color_light -> use_vertex_color_light: boolean "Add vertex colors as additional lighting" - + * ID|Material.vertex_color_paint -> use_vertex_color_paint: boolean "Replaces object base color with vertex colors (multiplies with texture face face assigned textures)" +#ID|Material.use_transparency -> use_transparency: boolean "Render material as transparent" +#ID|Material.use_transparent_shadows -> use_transparent_shadows: boolean "Allow this object to receive transparent shadows casted through other objects" +#ID|Material.use_vertex_color_light -> use_vertex_color_light: boolean "Add vertex colors as additional lighting" +#ID|Material.use_vertex_color_paint -> use_vertex_color_paint: boolean "Replaces object base color with vertex colors (multiplies with texture face face assigned textures)" #+ * ID|Material.volume -> volume: pointer, "(read-only) Volume settings for the material" #+ * ID|Mesh.active_uv_texture -> active_uv_texture: pointer "Active UV texture" #+ * ID|Mesh.active_uv_texture_index -> active_uv_texture_index: int "Active UV texture index" #+ * ID|Mesh.active_vertex_color -> active_vertex_color: pointer "Active vertex color layer" #+ * ID|Mesh.active_vertex_color_index -> active_vertex_color_index: int "Active vertex color index" #+ * ID|Mesh.animation_data -> animation_data: pointer, "(read-only) Animation data for this datablock" - + * ID|Mesh.autosmooth_angle -> auto_smooth_angle: int "Defines maximum angle between face normals that Auto Smooth will operate on" +#ID|Mesh.auto_smooth_angle -> auto_smooth_angle: int "Defines maximum angle between face normals that Auto Smooth will operate on" #+ * ID|Mesh.edges -> edges: collection, "(read-only) Edges of the mesh" #+ * ID|Mesh.faces -> faces: collection, "(read-only) Faces of the mesh" #ID|Mesh.layers_float -> layers_float: collection, "(read-only)" @@ -1458,14 +1458,14 @@ #ID|Mesh.show_normal_vertex -> show_normal_vertex: boolean "Displays vertex normals as lines" #+ * ID|Mesh.sticky -> sticky: collection, "(read-only) Sticky texture coordinates" #+ * ID|Mesh.texco_mesh -> texco_mesh: pointer "Derive texture coordinates from another mesh" - + * ID|Mesh.texspace_loc -> texspace_location: float[3] "Texture space location" +#ID|Mesh.texspace_location -> texspace_location: float[3] "Texture space location" #+ * ID|Mesh.texspace_size -> texspace_size: float[3] "Texture space size" #+ * ID|Mesh.texture_mesh -> texture_mesh: pointer "Use another mesh for texture indices (vertex indices must be aligned)" #+ * ID|Mesh.total_edge_sel -> total_edge_sel: int, "(read-only) Selected edge count in editmode" #+ * ID|Mesh.total_face_sel -> total_face_sel: int, "(read-only) Selected face count in editmode" #+ * ID|Mesh.total_vert_sel -> total_vert_sel: int, "(read-only) Selected vertex count in editmode" - + * ID|Mesh.autosmooth -> use_auto_smooth: boolean "Treats all set-smoothed faces with angles less than the specified angle as smooth during render" - + * ID|Mesh.auto_texspace -> use_auto_texspace: boolean "Adjusts active objects texture space automatically when transforming object" +#ID|Mesh.use_auto_smooth -> use_auto_smooth: boolean "Treats all set-smoothed faces with angles less than the specified angle as smooth during render" +#ID|Mesh.use_auto_texspace -> use_auto_texspace: boolean "Adjusts active objects texture space automatically when transforming object" #+ * ID|Mesh.use_mirror_topology -> use_mirror_topology: boolean "Use topology based mirroring" #+ * ID|Mesh.use_mirror_x -> use_mirror_x: boolean "X Axis mirror editing" #+ * ID|Mesh.use_paint_mask -> use_paint_mask: boolean "Face selection masking for painting" @@ -1480,13 +1480,13 @@ #+ * ID|MetaBall.animation_data -> animation_data: pointer, "(read-only) Animation data for this datablock" #+ * ID|MetaBall.elements -> elements: collection, "(read-only) Meta elements" #+ * ID|MetaBall.materials -> materials: collection, "(read-only)" - + * ID|MetaBall.render_size -> render_resolution: float "Polygonization resolution in rendering" - + * ID|MetaBall.wire_size -> resolution: float "Polygonization resolution in the 3D viewport" - + * ID|MetaBall.texspace_loc -> texspace_location: float[3] "Texture space location" +#ID|MetaBall.render_resolution -> render_resolution: float "Polygonization resolution in rendering" +#ID|MetaBall.resolution -> resolution: float "Polygonization resolution in the 3D viewport" +#ID|MetaBall.texspace_location -> texspace_location: float[3] "Texture space location" #+ * ID|MetaBall.texspace_size -> texspace_size: float[3] "Texture space size" #+ * ID|MetaBall.threshold -> threshold: float "Influence of meta elements" #ID|MetaBall.update_method -> update_method: enum "Metaball edit update behavior" - + * ID|MetaBall.auto_texspace -> use_auto_texspace: boolean "Adjusts active objects texture space automatically when transforming object" +#ID|MetaBall.use_auto_texspace -> use_auto_texspace: boolean "Adjusts active objects texture space automatically when transforming object" #+ * ID|NodeTree.animation_data -> animation_data: pointer, "(read-only) Animation data for this datablock" #+ * ID|NodeTree.grease_pencil -> grease_pencil: pointer "Grease Pencil datablock" #+ * ID|NodeTree.nodes -> nodes: collection, "(read-only)" @@ -1511,7 +1511,7 @@ #+ * ID|Object.delta_scale -> delta_scale: float[3] "Extra scaling added to the scale of the object" #+ * ID|Object.dimensions -> dimensions: float[3] "Absolute bounding box dimensions of the object" #+ * ID|Object.draw_bounds_type -> draw_bounds_type: enum "Object boundary display type" - + * ID|Object.max_draw_type -> draw_type: enum "Maximum draw type to display object with in viewport" +#ID|Object.draw_type -> draw_type: enum "Maximum draw type to display object with in viewport" #+ * ID|Object.dupli_faces_scale -> dupli_faces_scale: float "Scale the DupliFace objects" #+ * ID|Object.dupli_frames_end -> dupli_frames_end: int "End frame for DupliFrames" #+ * ID|Object.dupli_frames_off -> dupli_frames_off: int "Recurring frames to exclude from the Dupliframes" @@ -1573,50 +1573,50 @@ #+ * ID|Object.up_axis -> up_axis: enum "Axis that points in the upward direction" #+ * ID|Object.use_dupli_faces_scale -> use_dupli_faces_scale: boolean "Scale dupli based on face size" #+ * ID|Object.use_dupli_frames_speed -> use_dupli_frames_speed: boolean "Set dupliframes to use the frame" - + * ID|Object.use_dupli_verts_rotation -> use_dupli_vertices_rotation: boolean "Rotate dupli according to vertex normal" - + * ID|Object.shape_key_edit_mode -> use_shape_key_edit_mode: boolean "Apply shape keys in edit mode (for Meshes only)" - + * ID|Object.slow_parent -> use_slow_parent: boolean "Create a delay in the parent relationship" - + * ID|Object.time_offset_add_parent -> use_time_offset_add_parent: boolean "Add the parents time offset value" - + * ID|Object.time_offset_edit -> use_time_offset_edit: boolean "Use time offset when inserting keys and display time offset for F-Curve and action views" - + * ID|Object.time_offset_parent -> use_time_offset_parent: boolean "Apply the time offset to this objects parent relationship" - + * ID|Object.time_offset_particle -> use_time_offset_particle: boolean "Let the time offset work on the particle effect" +#ID|Object.use_dupli_vertices_rotation -> use_dupli_vertices_rotation: boolean "Rotate dupli according to vertex normal" +#ID|Object.use_shape_key_edit_mode -> use_shape_key_edit_mode: boolean "Apply shape keys in edit mode (for Meshes only)" +#ID|Object.use_slow_parent -> use_slow_parent: boolean "Create a delay in the parent relationship" +#ID|Object.use_time_offset_add_parent -> use_time_offset_add_parent: boolean "Add the parents time offset value" +#ID|Object.use_time_offset_edit -> use_time_offset_edit: boolean "Use time offset when inserting keys and display time offset for F-Curve and action views" +#ID|Object.use_time_offset_parent -> use_time_offset_parent: boolean "Apply the time offset to this objects parent relationship" +#ID|Object.use_time_offset_particle -> use_time_offset_particle: boolean "Let the time offset work on the particle effect" #+ * ID|Object.vertex_groups -> vertex_groups: collection, "(read-only) Vertex groups of the object" #+ * ID|ParticleSettings.active_dupliweight -> active_dupliweight: pointer, "(read-only)" #+ * ID|ParticleSettings.active_dupliweight_index -> active_dupliweight_index: int "NO DESCRIPTION" #+ * ID|ParticleSettings.adaptive_angle -> adaptive_angle: int "How many degrees path has to curve to make another render segment" - + * ID|ParticleSettings.adaptive_pix -> adaptive_pixel: int "How many pixels path has to cover to make another render segment" +#ID|ParticleSettings.adaptive_pixel -> adaptive_pixel: int "How many pixels path has to cover to make another render segment" #+ * ID|ParticleSettings.angular_velocity_factor -> angular_velocity_factor: float "Angular velocity amount" #+ * ID|ParticleSettings.angular_velocity_mode -> angular_velocity_mode: enum "Particle angular velocity mode" #+ * ID|ParticleSettings.animation_data -> animation_data: pointer, "(read-only) Animation data for this datablock" - + * ID|ParticleSettings.child_effector -> apply_effector_to_children: boolean "Apply effectors to children" - + * ID|ParticleSettings.child_guide -> apply_guide_to_children: boolean "NO DESCRIPTION" +#ID|ParticleSettings.apply_effector_to_children -> apply_effector_to_children: boolean "Apply effectors to children" +#ID|ParticleSettings.apply_guide_to_children -> apply_guide_to_children: boolean "NO DESCRIPTION" #+ * ID|ParticleSettings.billboard_align -> billboard_align: enum "In respect to what the billboards are aligned" #+ * ID|ParticleSettings.billboard_animation -> billboard_animation: enum "How to animate billboard textures" #+ * ID|ParticleSettings.billboard_object -> billboard_object: pointer "Billboards face this object (default is active camera)" #+ * ID|ParticleSettings.billboard_offset -> billboard_offset: float[2] "NO DESCRIPTION" - + * ID|ParticleSettings.billboard_split_offset -> billboard_offset_split: enum "How to offset billboard textures" +#ID|ParticleSettings.billboard_offset_split -> billboard_offset_split: enum "How to offset billboard textures" #+ * ID|ParticleSettings.billboard_tilt -> billboard_tilt: float "Tilt of the billboards" - + * ID|ParticleSettings.billboard_random_tilt -> billboard_tilt_random: float "Random tilt of the billboards" +#ID|ParticleSettings.billboard_tilt_random -> billboard_tilt_random: float "Random tilt of the billboards" #+ * ID|ParticleSettings.billboard_uv_split -> billboard_uv_split: int "Amount of rows/columns to split UV coordinates for billboards" #+ * ID|ParticleSettings.boids -> boids: pointer, "(read-only)" #+ * ID|ParticleSettings.branch_threshold -> branch_threshold: float "Threshold of branching" #+ * ID|ParticleSettings.brownian_factor -> brownian_factor: float "Specify the amount of Brownian motion" #+ * ID|ParticleSettings.child_length -> child_length: float "Length of child paths" - + * ID|ParticleSettings.child_length_thres -> child_length_threshold: float "Amount of particles left untouched by child path length" +#ID|ParticleSettings.child_length_threshold -> child_length_threshold: float "Amount of particles left untouched by child path length" #+ * ID|ParticleSettings.child_nbr -> child_nbr: int "Amount of children/parent" #+ * ID|ParticleSettings.child_radius -> child_radius: float "Radius of children around parent" #+ * ID|ParticleSettings.child_roundness -> child_roundness: float "Roundness of children around parent" #+ * ID|ParticleSettings.child_size -> child_size: float "A multiplier for the child particle size" - + * ID|ParticleSettings.child_random_size -> child_size_random: float "Random variation to the size of the child particles" +#ID|ParticleSettings.child_size_random -> child_size_random: float "Random variation to the size of the child particles" #+ * ID|ParticleSettings.child_type -> child_type: enum "Create child particles" #+ * ID|ParticleSettings.clump_factor -> clump_factor: float "Amount of clumping" - + * ID|ParticleSettings.clumppow -> clump_shape: float "Shape of clumping" - + * ID|ParticleSettings.amount -> count: int "Total number of particles" - + * ID|ParticleSettings.damp_factor -> damping: float "Specify the amount of damping" +#ID|ParticleSettings.clump_shape -> clump_shape: float "Shape of clumping" +#ID|ParticleSettings.count -> count: int "Total number of particles" +#ID|ParticleSettings.damping -> damping: float "Specify the amount of damping" #+ * ID|ParticleSettings.distribution -> distribution: enum "How to distribute particles on selected element" #+ * ID|ParticleSettings.drag_factor -> drag_factor: float "Specify the amount of air-drag" - + * ID|ParticleSettings.draw_as -> draw_method: enum "How particles are drawn in viewport" - + * ID|ParticleSettings.display -> draw_percentage: int "Percentage of particles to display in 3D view" +#ID|ParticleSettings.draw_method -> draw_method: enum "How particles are drawn in viewport" +#ID|ParticleSettings.draw_percentage -> draw_percentage: int "Percentage of particles to display in 3D view" #+ * ID|ParticleSettings.draw_size -> draw_size: int "Size of particles on viewport in pixels (0=default)" #+ * ID|ParticleSettings.draw_step -> draw_step: int "How many steps paths are drawn with (power of 2)" #+ * ID|ParticleSettings.dupli_group -> dupli_group: pointer "Show Objects in this Group in place of particles" @@ -1625,7 +1625,7 @@ #+ * ID|ParticleSettings.effect_hair -> effect_hair: float "Hair stiffness for effectors" #+ * ID|ParticleSettings.effector_weights -> effector_weights: pointer, "(read-only)" #+ * ID|ParticleSettings.emit_from -> emit_from: enum "Where to emit particles from" - + * ID|ParticleSettings.random_factor -> factor_random: float "Give the starting speed a random variation" +#ID|ParticleSettings.factor_random -> factor_random: float "Give the starting speed a random variation" #+ * ID|ParticleSettings.fluid -> fluid: pointer, "(read-only)" #+ * ID|ParticleSettings.force_field_1 -> force_field_1: pointer, "(read-only)" #+ * ID|ParticleSettings.force_field_2 -> force_field_2: pointer, "(read-only)" @@ -1634,7 +1634,7 @@ #+ * ID|ParticleSettings.grid_resolution -> grid_resolution: int "The resolution of the particle grid" #+ * ID|ParticleSettings.hair_step -> hair_step: int "Number of hair segments" #+ * ID|ParticleSettings.integrator -> integrator: enum "Select physics integrator type" - + * ID|ParticleSettings.grid_invert -> invert_grid: boolean "Invert what is considered object and what is not" +#ID|ParticleSettings.invert_grid -> invert_grid: boolean "Invert what is considered object and what is not" #+ * ID|ParticleSettings.jitter_factor -> jitter_factor: float "Amount of jitter applied to the sampling" #+ * ID|ParticleSettings.keyed_loops -> keyed_loops: int "Number of times the keys are looped" #+ * ID|ParticleSettings.keys_step -> keys_step: int "NO DESCRIPTION" @@ -1643,83 +1643,83 @@ #+ * ID|ParticleSettings.kink_axis -> kink_axis: enum "Which axis to use for offset" #+ * ID|ParticleSettings.kink_frequency -> kink_frequency: float "The frequency of the offset (1/total length)" #+ * ID|ParticleSettings.kink_shape -> kink_shape: float "Adjust the offset to the beginning/end" - + * ID|ParticleSettings.random_length -> length_random: float "Give path length a random variation" +#ID|ParticleSettings.length_random -> length_random: float "Give path length a random variation" #+ * ID|ParticleSettings.lifetime -> lifetime: float "Specify the life span of the particles" - + * ID|ParticleSettings.random_lifetime -> lifetime_random: float "Give the particle life a random variation" +#ID|ParticleSettings.lifetime_random -> lifetime_random: float "Give the particle life a random variation" #+ * ID|ParticleSettings.line_length_head -> line_length_head: float "Length of the lines head" #+ * ID|ParticleSettings.line_length_tail -> line_length_tail: float "Length of the lines tail" - + * ID|ParticleSettings.billboard_lock -> lock_billboard: boolean "Lock the billboards align axis" - + * ID|ParticleSettings.boids_2d -> lock_boids_to_surface: boolean "Constrain boids to a surface" +#ID|ParticleSettings.lock_billboard -> lock_billboard: boolean "Lock the billboards align axis" +#ID|ParticleSettings.lock_boids_to_surface -> lock_boids_to_surface: boolean "Constrain boids to a surface" #+ * ID|ParticleSettings.mass -> mass: float "Specify the mass of the particles" #+ * ID|ParticleSettings.material -> material: int "Specify material used for the particles" #+ * ID|ParticleSettings.normal_factor -> normal_factor: float "Let the surface normal give the particle a starting speed" - + * ID|ParticleSettings.object_aligned_factor -> object_align_factor: float[3] "Let the emitter object orientation give the particle a starting speed" +#ID|ParticleSettings.object_align_factor -> object_align_factor: float[3] "Let the emitter object orientation give the particle a starting speed" #+ * ID|ParticleSettings.object_factor -> object_factor: float "Let the object give the particle a starting speed" #+ * ID|ParticleSettings.particle_factor -> particle_factor: float "Let the target particle give the particle a starting speed" #+ * ID|ParticleSettings.particle_size -> particle_size: float "The size of the particles" #+ * ID|ParticleSettings.path_end -> path_end: float "End time of drawn path" #+ * ID|ParticleSettings.path_start -> path_start: float "Starting time of drawn path" #+ * ID|ParticleSettings.phase_factor -> phase_factor: float "Initial rotation phase" - + * ID|ParticleSettings.random_phase_factor -> phase_factor_random: float "Randomize rotation phase" +#ID|ParticleSettings.phase_factor_random -> phase_factor_random: float "Randomize rotation phase" #+ * ID|ParticleSettings.physics_type -> physics_type: enum "Particle physics type" #+ * ID|ParticleSettings.react_event -> react_event: enum "The event of target particles to react on" #+ * ID|ParticleSettings.reaction_shape -> reaction_shape: float "Power of reaction strength dependence on distance to target" #+ * ID|ParticleSettings.reactor_factor -> reactor_factor: float "Let the vector away from the target particles location give the particle a starting speed" #+ * ID|ParticleSettings.render_step -> render_step: int "How many steps paths are rendered with (power of 2)" - + * ID|ParticleSettings.ren_as -> render_type: enum "How particles are rendered" - + * ID|ParticleSettings.rendered_child_nbr -> rendered_child_count: int "Amount of children/parent for rendering" - + * ID|ParticleSettings.random_rotation_factor -> rotation_factor_random: float "Randomize rotation" +#ID|ParticleSettings.render_type -> render_type: enum "How particles are rendered" +#ID|ParticleSettings.rendered_child_count -> rendered_child_count: int "Amount of children/parent for rendering" +#ID|ParticleSettings.rotation_factor_random -> rotation_factor_random: float "Randomize rotation" #+ * ID|ParticleSettings.rotation_mode -> rotation_mode: enum "Particles initial rotation" - + * ID|ParticleSettings.rough1 -> roughness_1: float "Amount of location dependent rough" - + * ID|ParticleSettings.rough1_size -> roughness_1_size: float "Size of location dependent rough" - + * ID|ParticleSettings.rough2 -> roughness_2: float "Amount of random rough" - + * ID|ParticleSettings.rough2_size -> roughness_2_size: float "Size of random rough" - + * ID|ParticleSettings.rough2_thres -> roughness_2_threshold: float "Amount of particles left untouched by random rough" - + * ID|ParticleSettings.rough_end_shape -> roughness_end_shape: float "Shape of end point rough" - + * ID|ParticleSettings.rough_endpoint -> roughness_endpoint: float "Amount of end point rough" +#ID|ParticleSettings.roughness_1 -> roughness_1: float "Amount of location dependent rough" +#ID|ParticleSettings.roughness_1_size -> roughness_1_size: float "Size of location dependent rough" +#ID|ParticleSettings.roughness_2 -> roughness_2: float "Amount of random rough" +#ID|ParticleSettings.roughness_2_size -> roughness_2_size: float "Size of random rough" +#ID|ParticleSettings.roughness_2_threshold -> roughness_2_threshold: float "Amount of particles left untouched by random rough" +#ID|ParticleSettings.roughness_end_shape -> roughness_end_shape: float "Shape of end point rough" +#ID|ParticleSettings.roughness_endpoint -> roughness_endpoint: float "Amount of end point rough" #ID|ParticleSettings.show_health -> show_health: boolean "Draw boid health" #ID|ParticleSettings.show_material_color -> show_material_color: boolean "Draw particles using materials diffuse color" #ID|ParticleSettings.show_number -> show_number: boolean "Show particle number" #+ * ID|ParticleSettings.show_size -> show_size: boolean "Show particle size" #ID|ParticleSettings.show_unborn -> show_unborn: boolean "Show particles before they are emitted" - + * ID|ParticleSettings.velocity -> show_velocity: boolean "Show particle velocity" +#ID|ParticleSettings.show_velocity -> show_velocity: boolean "Show particle velocity" #+ * ID|ParticleSettings.simplify_rate -> simplify_rate: float "Speed of simplification" #+ * ID|ParticleSettings.simplify_refsize -> simplify_refsize: int "Reference size in pixels, after which simplification begins" #+ * ID|ParticleSettings.simplify_transition -> simplify_transition: float "Transition period for fading out strands" #+ * ID|ParticleSettings.simplify_viewport -> simplify_viewport: float "Speed of Simplification" - + * ID|ParticleSettings.random_size -> size_random: float "Give the particle size a random variation" +#ID|ParticleSettings.size_random -> size_random: float "Give the particle size a random variation" #+ * ID|ParticleSettings.subframes -> subframes: int "Subframes to simulate for improved stability and finer granularity simulations" #+ * ID|ParticleSettings.tangent_factor -> tangent_factor: float "Let the surface tangent give the particle a starting speed" #+ * ID|ParticleSettings.tangent_phase -> tangent_phase: float "Rotate the surface tangent" #+ * ID|ParticleSettings.time_tweak -> time_tweak: float "A multiplier for physics timestep (1.0 means one frame = 1/25 seconds)" #+ * ID|ParticleSettings.trail_count -> trail_count: int "Number of trail particles" #+ * ID|ParticleSettings.type -> type: enum "NO DESCRIPTION" - + * ID|ParticleSettings.abs_path_time -> use_absolute_path_time: boolean "Path timing is in absolute frames" - + * ID|ParticleSettings.animate_branching -> use_animate_branching: boolean "Animate branching" - + * ID|ParticleSettings.branching -> use_branching: boolean "Branch child paths from each other" - + * ID|ParticleSettings.died -> use_dead: boolean "Show particles after they have died" - + * ID|ParticleSettings.die_on_collision -> use_die_on_collision: boolean "Particles die when they collide with a deflector object" - + * ID|ParticleSettings.rotation_dynamic -> use_dynamic_rotation: boolean "Sets rotation to dynamic/constant" - + * ID|ParticleSettings.trand -> use_emit_random: boolean "Emit in random order of elements" - + * ID|ParticleSettings.even_distribution -> use_even_distribution: boolean "Use even distribution from faces based on face areas or edge lengths" +#ID|ParticleSettings.use_absolute_path_time -> use_absolute_path_time: boolean "Path timing is in absolute frames" +#ID|ParticleSettings.use_animate_branching -> use_animate_branching: boolean "Animate branching" +#ID|ParticleSettings.use_branching -> use_branching: boolean "Branch child paths from each other" +#ID|ParticleSettings.use_dead -> use_dead: boolean "Show particles after they have died" +#ID|ParticleSettings.use_die_on_collision -> use_die_on_collision: boolean "Particles die when they collide with a deflector object" +#ID|ParticleSettings.use_dynamic_rotation -> use_dynamic_rotation: boolean "Sets rotation to dynamic/constant" +#ID|ParticleSettings.use_emit_random -> use_emit_random: boolean "Emit in random order of elements" +#ID|ParticleSettings.use_even_distribution -> use_even_distribution: boolean "Use even distribution from faces based on face areas or edge lengths" #+ * ID|ParticleSettings.use_global_dupli -> use_global_dupli: boolean "Use objects global coordinates for duplication" #+ * ID|ParticleSettings.use_group_count -> use_group_count: boolean "Use object multiple times in the same group" - + * ID|ParticleSettings.rand_group -> use_group_pick_random: boolean "Pick objects from group randomly" - + * ID|ParticleSettings.hair_bspline -> use_hair_bspline: boolean "Interpolate hair using B-Splines" - + * ID|ParticleSettings.sizemass -> use_multiply_size_mass: boolean "Multiply mass by particle size" - + * ID|ParticleSettings.parent -> use_parent_particles: boolean "Render parent particles" - + * ID|ParticleSettings.react_multiple -> use_react_multiple: boolean "React multiple times" - + * ID|ParticleSettings.react_start_end -> use_react_start_end: boolean "Give birth to unreacted particles eventually" - + * ID|ParticleSettings.render_adaptive -> use_render_adaptive: boolean "Draw steps of the particle path" - + * ID|ParticleSettings.emitter -> use_render_emitter: boolean "Render emitter Object also" - + * ID|ParticleSettings.self_effect -> use_self_effect: boolean "Particle effectors effect themselves" - + * ID|ParticleSettings.enable_simplify -> use_simplify: boolean "Remove child strands as the object becomes smaller on the screen" - + * ID|ParticleSettings.viewport -> use_simplify_viewport: boolean "NO DESCRIPTION" - + * ID|ParticleSettings.size_deflect -> use_size_deflect: boolean "Use particles size in deflection" - + * ID|ParticleSettings.render_strand -> use_strand_primitive: boolean "Use the strand primitive for rendering" - + * ID|ParticleSettings.symmetric_branching -> use_symmetric_branching: boolean "Start and end points are the same" - + * ID|ParticleSettings.velocity_length -> use_velocity_length: boolean "Multiply line length by particle speed" - + * ID|ParticleSettings.whole_group -> use_whole_group: boolean "Use whole group at once" +#ID|ParticleSettings.use_group_pick_random -> use_group_pick_random: boolean "Pick objects from group randomly" +#ID|ParticleSettings.use_hair_bspline -> use_hair_bspline: boolean "Interpolate hair using B-Splines" +#ID|ParticleSettings.use_multiply_size_mass -> use_multiply_size_mass: boolean "Multiply mass by particle size" +#ID|ParticleSettings.use_parent_particles -> use_parent_particles: boolean "Render parent particles" +#ID|ParticleSettings.use_react_multiple -> use_react_multiple: boolean "React multiple times" +#ID|ParticleSettings.use_react_start_end -> use_react_start_end: boolean "Give birth to unreacted particles eventually" +#ID|ParticleSettings.use_render_adaptive -> use_render_adaptive: boolean "Draw steps of the particle path" +#ID|ParticleSettings.use_render_emitter -> use_render_emitter: boolean "Render emitter Object also" +#ID|ParticleSettings.use_self_effect -> use_self_effect: boolean "Particle effectors effect themselves" +#ID|ParticleSettings.use_simplify -> use_simplify: boolean "Remove child strands as the object becomes smaller on the screen" +#ID|ParticleSettings.use_simplify_viewport -> use_simplify_viewport: boolean "NO DESCRIPTION" +#ID|ParticleSettings.use_size_deflect -> use_size_deflect: boolean "Use particles size in deflection" +#ID|ParticleSettings.use_strand_primitive -> use_strand_primitive: boolean "Use the strand primitive for rendering" +#ID|ParticleSettings.use_symmetric_branching -> use_symmetric_branching: boolean "Start and end points are the same" +#ID|ParticleSettings.use_velocity_length -> use_velocity_length: boolean "Multiply line length by particle speed" +#ID|ParticleSettings.use_whole_group -> use_whole_group: boolean "Use whole group at once" #+ * ID|ParticleSettings.userjit -> userjit: int "Emission locations / face (0 = automatic)" #+ * ID|ParticleSettings.virtual_parents -> virtual_parents: float "Relative amount of virtual parents" #+ * ID|Scene.active_keying_set -> active_keying_set: pointer "Active Keying Set used to insert/delete keyframes" @@ -1790,36 +1790,36 @@ #+TODO MAKE COLOR * ID|Texture.factor_blue -> factor_blue: float "NO DESCRIPTION" #+TODO MAKE COLOR * ID|Texture.factor_green -> factor_green: float "NO DESCRIPTION" #+TODO MAKE COLOR * ID|Texture.factor_red -> factor_red: float "NO DESCRIPTION" - + * ID|Texture.brightness -> intensity: float "NO DESCRIPTION" +#ID|Texture.intensity -> intensity: float "NO DESCRIPTION" #+ * ID|Texture.node_tree -> node_tree: pointer, "(read-only) Node tree for node-based textures" #+ * ID|Texture.saturation -> saturation: float "NO DESCRIPTION" #+ * ID|Texture.type -> type: enum "NO DESCRIPTION" #+ * ID|Texture.use_color_ramp -> use_color_ramp: boolean "Toggle color ramp operations" #+ * ID|Texture.use_nodes -> use_nodes: boolean "Make this a node-based texture" #+ * ID|Texture.use_preview_alpha -> use_preview_alpha: boolean "Show Alpha in Preview Render" -#+ * ID|Texture|BlendTexture.flip_axis -> flip_axis: enum "Flips the textures X and Y axis" #+ * ID|Texture|BlendTexture.progression -> progression: enum "Sets the style of the color blending" - + * ID|Texture|CloudsTexture.stype -> cloud_type: enum "NO DESCRIPTION" +#ID|Texture|BlendTexture.use_flip_axis -> use_flip_axis: enum "Flips the textures X and Y axis" +#ID|Texture|CloudsTexture.cloud_type -> cloud_type: enum "NO DESCRIPTION" #+ * ID|Texture|CloudsTexture.nabla -> nabla: float "Size of derivative offset used for calculating normal" #+ * ID|Texture|CloudsTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" #+ * ID|Texture|CloudsTexture.noise_depth -> noise_depth: int "Sets the depth of the cloud calculation" - + * ID|Texture|CloudsTexture.noise_size -> noise_scale: float "Sets scaling for noise input" +#ID|Texture|CloudsTexture.noise_scale -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|CloudsTexture.noise_type -> noise_type: enum "NO DESCRIPTION" #+ * ID|Texture|DistortedNoiseTexture.distortion -> distortion: float "NO DESCRIPTION" #+ * ID|Texture|DistortedNoiseTexture.nabla -> nabla: float "Size of derivative offset used for calculating normal" #+ * ID|Texture|DistortedNoiseTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" #+ * ID|Texture|DistortedNoiseTexture.noise_distortion -> noise_distortion: enum "Sets the noise basis for the distortion" - + * ID|Texture|DistortedNoiseTexture.noise_size -> noise_scale: float "Sets scaling for noise input" +#ID|Texture|DistortedNoiseTexture.noise_scale -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|EnvironmentMapTexture.environment_map -> environment_map: pointer, "(read-only) Gets the environment map associated with this texture" #+ * ID|Texture|EnvironmentMapTexture.filter_eccentricity -> filter_eccentricity: int "Maximum eccentricity. Higher gives less blur at distant/oblique angles, but is also slower" #+ * ID|Texture|EnvironmentMapTexture.filter_probes -> filter_probes: int "Maximum number of samples. Higher gives less blur at distant/oblique angles, but is also slower" #+ * ID|Texture|EnvironmentMapTexture.filter_size -> filter_size: float "Multiplies the filter size used by MIP Map and Interpolation" - + * ID|Texture|EnvironmentMapTexture.filter -> filter_type: enum "Texture filter to use for sampling image" +#ID|Texture|EnvironmentMapTexture.filter_type -> filter_type: enum "Texture filter to use for sampling image" #+ * ID|Texture|EnvironmentMapTexture.image -> image: pointer "Source image file to read the environment map from" #+ * ID|Texture|EnvironmentMapTexture.image_user -> image_user: pointer, "(read-only) Parameters defining which layer, pass and frame of the image is displayed" - + * ID|Texture|EnvironmentMapTexture.filter_size_minimum -> use_filter_size_min: boolean "Use Filter Size as a minimal filter value in pixels" - + * ID|Texture|EnvironmentMapTexture.mipmap -> use_mipmap: boolean "Uses auto-generated MIP maps for the image" - + * ID|Texture|EnvironmentMapTexture.mipmap_gauss -> use_mipmap_gauss: boolean "Uses Gauss filter to sample down MIP maps" +#ID|Texture|EnvironmentMapTexture.use_filter_size_min -> use_filter_size_min: boolean "Use Filter Size as a minimal filter value in pixels" +#ID|Texture|EnvironmentMapTexture.use_mipmap -> use_mipmap: boolean "Uses auto-generated MIP maps for the image" +#ID|Texture|EnvironmentMapTexture.use_mipmap_gauss -> use_mipmap_gauss: boolean "Uses Gauss filter to sample down MIP maps" #+ * ID|Texture|ImageTexture.checker_distance -> checker_distance: float "Sets distance between checker tiles" #+ * ID|Texture|ImageTexture.crop_max_x -> crop_max_x: float "Sets maximum X value to crop the image" #+ * ID|Texture|ImageTexture.crop_max_y -> crop_max_y: float "Sets maximum Y value to crop the image" @@ -1829,7 +1829,7 @@ #+ * ID|Texture|ImageTexture.filter_eccentricity -> filter_eccentricity: int "Maximum eccentricity. Higher gives less blur at distant/oblique angles, but is also slower" #+ * ID|Texture|ImageTexture.filter_probes -> filter_probes: int "Maximum number of samples. Higher gives less blur at distant/oblique angles, but is also slower" #+ * ID|Texture|ImageTexture.filter_size -> filter_size: float "Multiplies the filter size used by MIP Map and Interpolation" - + * ID|Texture|ImageTexture.filter -> filter_type: enum "Texture filter to use for sampling image" +#ID|Texture|ImageTexture.filter_type -> filter_type: enum "Texture filter to use for sampling image" #+ * ID|Texture|ImageTexture.image -> image: pointer "NO DESCRIPTION" #+ * ID|Texture|ImageTexture.image_user -> image_user: pointer, "(read-only) Parameters defining which layer, pass and frame of the image is displayed" #+ * ID|Texture|ImageTexture.invert_alpha -> invert_alpha: boolean "Inverts all the alpha values in the image" @@ -1837,49 +1837,49 @@ #+ * ID|Texture|ImageTexture.repeat_x -> repeat_x: int "Sets a repetition multiplier in the X direction" #+ * ID|Texture|ImageTexture.repeat_y -> repeat_y: int "Sets a repetition multiplier in the Y direction" #+ * ID|Texture|ImageTexture.use_alpha -> use_alpha: boolean "Uses the alpha channel information in the image" - + * ID|Texture|ImageTexture.calculate_alpha -> use_calculate_alpha: boolean "Calculates an alpha channel based on RGB values in the image" - + * ID|Texture|ImageTexture.checker_even -> use_checker_even: boolean "Sets even checker tiles" - + * ID|Texture|ImageTexture.checker_odd -> use_checker_odd: boolean "Sets odd checker tiles" - + * ID|Texture|ImageTexture.filter_size_minimum -> use_filter_size_min: boolean "Use Filter Size as a minimal filter value in pixels" - + * ID|Texture|ImageTexture.flip_axis -> use_flip_axis: boolean "Flips the textures X and Y axis" - + * ID|Texture|ImageTexture.interpolation -> use_interpolation: boolean "Interpolates pixels using Area filter" - + * ID|Texture|ImageTexture.mipmap -> use_mipmap: boolean "Uses auto-generated MIP maps for the image" - + * ID|Texture|ImageTexture.mipmap_gauss -> use_mipmap_gauss: boolean "Uses Gauss filter to sample down MIP maps" - + * ID|Texture|ImageTexture.mirror_x -> use_mirror_x: boolean "Mirrors the image repetition on the X direction" - + * ID|Texture|ImageTexture.mirror_y -> use_mirror_y: boolean "Mirrors the image repetition on the Y direction" - + * ID|Texture|ImageTexture.normal_map -> use_normal_map: boolean "Uses image RGB values for normal mapping" +#ID|Texture|ImageTexture.use_calculate_alpha -> use_calculate_alpha: boolean "Calculates an alpha channel based on RGB values in the image" +#ID|Texture|ImageTexture.use_checker_even -> use_checker_even: boolean "Sets even checker tiles" +#ID|Texture|ImageTexture.use_checker_odd -> use_checker_odd: boolean "Sets odd checker tiles" +#ID|Texture|ImageTexture.use_filter_size_min -> use_filter_size_min: boolean "Use Filter Size as a minimal filter value in pixels" +#ID|Texture|ImageTexture.use_flip_axis -> use_flip_axis: boolean "Flips the textures X and Y axis" +#ID|Texture|ImageTexture.use_interpolation -> use_interpolation: boolean "Interpolates pixels using Area filter" +#ID|Texture|ImageTexture.use_mipmap -> use_mipmap: boolean "Uses auto-generated MIP maps for the image" +#ID|Texture|ImageTexture.use_mipmap_gauss -> use_mipmap_gauss: boolean "Uses Gauss filter to sample down MIP maps" +#ID|Texture|ImageTexture.use_mirror_x -> use_mirror_x: boolean "Mirrors the image repetition on the X direction" +#ID|Texture|ImageTexture.use_mirror_y -> use_mirror_y: boolean "Mirrors the image repetition on the Y direction" +#ID|Texture|ImageTexture.use_normal_map -> use_normal_map: boolean "Uses image RGB values for normal mapping" #+ * ID|Texture|MagicTexture.noise_depth -> noise_depth: int "Sets the depth of the cloud calculation" #+ * ID|Texture|MagicTexture.turbulence -> turbulence: float "Sets the turbulence of the bandnoise and ringnoise types" - + * ID|Texture|MarbleTexture.stype -> marble_type: enum "NO DESCRIPTION" +#ID|Texture|MarbleTexture.marble_type -> marble_type: enum "NO DESCRIPTION" #+ * ID|Texture|MarbleTexture.nabla -> nabla: float "Size of derivative offset used for calculating normal" #+ * ID|Texture|MarbleTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" #+ * ID|Texture|MarbleTexture.noise_depth -> noise_depth: int "Sets the depth of the cloud calculation" - + * ID|Texture|MarbleTexture.noise_size -> noise_scale: float "Sets scaling for noise input" +#ID|Texture|MarbleTexture.noise_scale -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|MarbleTexture.noise_type -> noise_type: enum "NO DESCRIPTION" - + * ID|Texture|MarbleTexture.noisebasis2 -> noisebasis_2: enum "NO DESCRIPTION" +#ID|Texture|MarbleTexture.noisebasis_2 -> noisebasis_2: enum "NO DESCRIPTION" #+ * ID|Texture|MarbleTexture.turbulence -> turbulence: float "Sets the turbulence of the bandnoise and ringnoise types" - + * ID|Texture|MusgraveTexture.highest_dimension -> dimension_max: float "Highest fractal dimension" +#ID|Texture|MusgraveTexture.dimension_max -> dimension_max: float "Highest fractal dimension" #+ * ID|Texture|MusgraveTexture.gain -> gain: float "The gain multiplier" #+ * ID|Texture|MusgraveTexture.lacunarity -> lacunarity: float "Gap between successive frequencies" #+ * ID|Texture|MusgraveTexture.musgrave_type -> musgrave_type: enum "NO DESCRIPTION" #+ * ID|Texture|MusgraveTexture.nabla -> nabla: float "Size of derivative offset used for calculating normal" #+ * ID|Texture|MusgraveTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" #+ * ID|Texture|MusgraveTexture.noise_intensity -> noise_intensity: float "NO DESCRIPTION" - + * ID|Texture|MusgraveTexture.noise_size -> noise_scale: float "Sets scaling for noise input" +#ID|Texture|MusgraveTexture.noise_scale -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|MusgraveTexture.octaves -> octaves: float "Number of frequencies used" #+ * ID|Texture|MusgraveTexture.offset -> offset: float "The fractal offset" #ID|Texture|PointDensityTexture.point_density -> point_density: pointer, "(read-only) The point density settings associated with this texture" #+ * ID|Texture|StucciTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" - + * ID|Texture|StucciTexture.noise_size -> noise_scale: float "Sets scaling for noise input" +#ID|Texture|StucciTexture.noise_scale -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|StucciTexture.noise_type -> noise_type: enum "NO DESCRIPTION" - + * ID|Texture|StucciTexture.stype -> stucci_type: enum "NO DESCRIPTION" +#ID|Texture|StucciTexture.stucci_type -> stucci_type: enum "NO DESCRIPTION" #+ * ID|Texture|StucciTexture.turbulence -> turbulence: float "Sets the turbulence of the bandnoise and ringnoise types" - + * ID|Texture|VoronoiTexture.coloring -> color_mode: enum "NO DESCRIPTION" +#ID|Texture|VoronoiTexture.color_mode -> color_mode: enum "NO DESCRIPTION" #+ * ID|Texture|VoronoiTexture.distance_metric -> distance_metric: enum "NO DESCRIPTION" #+ * ID|Texture|VoronoiTexture.minkovsky_exponent -> minkovsky_exponent: float "Minkovsky exponent" #+ * ID|Texture|VoronoiTexture.nabla -> nabla: float "Size of derivative offset used for calculating normal" #+ * ID|Texture|VoronoiTexture.noise_intensity -> noise_intensity: float "NO DESCRIPTION" - + * ID|Texture|VoronoiTexture.noise_size -> noise_scale: float "Sets scaling for noise input" +#ID|Texture|VoronoiTexture.noise_scale -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|VoronoiTexture.weight_1 -> weight_1: float "Voronoi feature weight 1" #+ * ID|Texture|VoronoiTexture.weight_2 -> weight_2: float "Voronoi feature weight 2" #+ * ID|Texture|VoronoiTexture.weight_3 -> weight_3: float "Voronoi feature weight 3" @@ -1889,11 +1889,11 @@ #ID|Texture|VoxelDataTexture.voxel_data -> voxel_data: pointer, "(read-only) The voxel data associated with this texture" #+ * ID|Texture|WoodTexture.nabla -> nabla: float "Size of derivative offset used for calculating normal" #+ * ID|Texture|WoodTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" - + * ID|Texture|WoodTexture.noise_size -> noise_scale: float "Sets scaling for noise input" +#ID|Texture|WoodTexture.noise_scale -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|WoodTexture.noise_type -> noise_type: enum "NO DESCRIPTION" - + * ID|Texture|WoodTexture.noisebasis2 -> noisebasis_2: enum "NO DESCRIPTION" +#ID|Texture|WoodTexture.noisebasis_2 -> noisebasis_2: enum "NO DESCRIPTION" #+ * ID|Texture|WoodTexture.turbulence -> turbulence: float "Sets the turbulence of the bandnoise and ringnoise types" - + * ID|Texture|WoodTexture.stype -> wood_type: enum "NO DESCRIPTION" +#ID|Texture|WoodTexture.wood_type -> wood_type: enum "NO DESCRIPTION" #+ * ID|VectorFont.filepath -> filepath: string, "(read-only)" #+ * ID|VectorFont.packed_file -> packed_file: pointer, "(read-only)" #TODO, move into collectin * ID|WindowManager.active_keyconfig -> active_keyconfig: pointer "NO DESCRIPTION" @@ -1905,16 +1905,16 @@ #+ * ID|World.active_texture_index -> active_texture_index: int "Index of active texture slot" #+ * ID|World.ambient_color -> ambient_color: float[3] "NO DESCRIPTION" #+ * ID|World.animation_data -> animation_data: pointer, "(read-only) Animation data for this datablock" - + * ID|World.range -> color_range: float "The color range that will be mapped to 0-1" +#ID|World.color_range -> color_range: float "The color range that will be mapped to 0-1" #+ * ID|World.exposure -> exposure: float "Amount of exponential color correction for light" #+ * ID|World.horizon_color -> horizon_color: float[3] "Color at the horizon" - + * ID|World.lighting -> light_settings: pointer, "(read-only) World lighting settings" - + * ID|World.mist -> mist_settings: pointer, "(read-only) World mist settings" - + * ID|World.stars -> star_settings: pointer, "(read-only) World stars settings" +#ID|World.light_settings -> light_settings: pointer, "(read-only) World lighting settings" +#ID|World.mist_settings -> mist_settings: pointer, "(read-only) World mist settings" +#ID|World.star_settings -> star_settings: pointer, "(read-only) World stars settings" #+ * ID|World.texture_slots -> texture_slots: collection, "(read-only) Texture slots defining the mapping and influence of textures" - + * ID|World.blend_sky -> use_sky_blend: boolean "Render background with natural progression from horizon to zenith" - + * ID|World.paper_sky -> use_sky_paper: boolean "Flatten blend or texture coordinates" - + * ID|World.real_sky -> use_sky_real: boolean "Render background with a real horizon, relative to the camera angle" +#ID|World.use_sky_blend -> use_sky_blend: boolean "Render background with natural progression from horizon to zenith" +#ID|World.use_sky_paper -> use_sky_paper: boolean "Flatten blend or texture coordinates" +#ID|World.use_sky_real -> use_sky_real: boolean "Render background with a real horizon, relative to the camera angle" #+ * ID|World.zenith_color -> zenith_color: float[3] "Color at the zenith" #+ * IKParam.ik_solver -> ik_solver: enum, "(read-only) IK solver for which these parameters are defined, 0 for Legacy, 1 for iTaSC" #IKParam|Itasc.damping_epsilon -> damping_epsilon: float "Singular value under which damping is progressively applied. Higher values=more stability, less reactivity. Default=0.1" @@ -1931,13 +1931,13 @@ #IKParam|Itasc.use_auto_step -> use_auto_step: boolean "Automatically determine the optimal number of steps for best performance/accuracy trade off" #IKParam|Itasc.velocity_max -> velocity_max: float "Maximum joint velocity in rad/s. Default=50" #+ * ImageUser.fields_per_frame -> fields_per_frame: int "The number of fields per rendered frame (2 fields is 1 image)" - + * ImageUser.frames -> frame_duration: int "Sets the number of images of a movie to use" - + * ImageUser.offset -> frame_offset: int "Offsets the number of the frame to use in the animation" +#ImageUser.frame_duration -> frame_duration: int "Sets the number of images of a movie to use" +#ImageUser.frame_offset -> frame_offset: int "Offsets the number of the frame to use in the animation" #+ * ImageUser.frame_start -> frame_start: int "Sets the global starting frame of the movie" #+ * ImageUser.multilayer_layer -> multilayer_layer: int, "(read-only) Layer in multilayer image" #+ * ImageUser.multilayer_pass -> multilayer_pass: int, "(read-only) Pass in multilayer image" - + * ImageUser.auto_refresh -> use_auto_refresh: boolean "Always refresh image on frame changes" - + * ImageUser.cyclic -> use_cyclic: boolean "Cycle the images in the movie" +#ImageUser.use_auto_refresh -> use_auto_refresh: boolean "Always refresh image on frame changes" +#ImageUser.use_cyclic -> use_cyclic: boolean "Cycle the images in the movie" #KeyConfig.is_user_defined -> is_user_defined: boolean, "(read-only) Indicates that a keyconfig was defined by the user" #+ * KeyConfig.keymaps -> keymaps: collection, "(read-only) Key maps configured as part of this configuration" #+ * KeyConfig.name -> name: string "Name of the key configuration" @@ -2004,13 +2004,13 @@ #+ * LampSkySettings.atmosphere_inscattering -> atmosphere_inscattering: float "Scatter contribution factor" #+ * LampSkySettings.atmosphere_turbidity -> atmosphere_turbidity: float "Sky turbidity" #+ * LampSkySettings.backscattered_light -> backscattered_light: float "Backscattered light" - + * LampSkySettings.horizon_brightness -> horizon_intensity: float "Horizon brightness" +#+ * LampSkySettings.horizon_brightness -> horizon_brightness: float "Horizon brightness" #+ * LampSkySettings.sky_blend -> sky_blend: float "Blend factor with sky" #+ * LampSkySettings.sky_blend_type -> sky_blend_type: enum "Blend mode for combining sun sky with world sky" #+ * LampSkySettings.sky_color_space -> sky_color_space: enum "Color space to use for internal XYZ->RGB color conversion" #+ * LampSkySettings.sky_exposure -> sky_exposure: float "Strength of sky shading exponential exposure correction" #+ * LampSkySettings.spread -> spread: float "Horizon Spread" - + * LampSkySettings.sun_brightness -> sun_intensity: float "Sun brightness" +#+ * LampSkySettings.sun_brightness -> sun_brightness: float "Sun brightness" #+ * LampSkySettings.sun_intensity -> sun_intensity: float "Sun intensity" #+ * LampSkySettings.sun_size -> sun_size: float "Sun size" #+ * LampSkySettings.use_atmosphere -> use_atmosphere: boolean "Apply sun effect on atmosphere" @@ -2057,29 +2057,29 @@ #+ * MaterialHalo.flare_boost -> flare_boost: float "Gives the flare extra strength" #+ * MaterialHalo.flare_seed -> flare_seed: int "Specifies an offset in the flare seed table" #+ * MaterialHalo.flare_size -> flare_size: float "Sets the factor by which the flare is larger than the halo" - + * MaterialHalo.flares_sub -> flare_subflare_count: int "Sets the number of subflares" - + * MaterialHalo.flare_subsize -> flare_subflare_size: float "Sets the dimension of the subflares, dots and circles" +#MaterialHalo.flare_subflare_count -> flare_subflare_count: int "Sets the number of subflares" +#MaterialHalo.flare_subflare_size -> flare_subflare_size: float "Sets the dimension of the subflares, dots and circles" #+ * MaterialHalo.hardness -> hardness: int "Sets the hardness of the halo" - + * MaterialHalo.line_number -> line_count: int "Sets the number of star shaped lines rendered over the halo" - + * MaterialHalo.rings -> ring_count: int "Sets the number of rings rendered over the halo" +#MaterialHalo.line_count -> line_count: int "Sets the number of star shaped lines rendered over the halo" +#MaterialHalo.ring_count -> ring_count: int "Sets the number of rings rendered over the halo" #+ * MaterialHalo.seed -> seed: int "Randomizes ring dimension and line location" #MaterialHalo.show_shaded -> show_shaded: boolean "Lets halo receive light and shadows from external objects" #+ * MaterialHalo.size -> size: float "Sets the dimension of the halo" - + * MaterialHalo.star_tips -> star_tip_count: int "Sets the number of points on the star shaped halo" - + * MaterialHalo.xalpha -> use_extreme_alpha: boolean "Uses extreme alpha" - + * MaterialHalo.flare_mode -> use_flare_mode: boolean "Renders halo as a lensflare" - + * MaterialHalo.lines -> use_lines: boolean "Renders star shaped lines over halo" - + * MaterialHalo.ring -> use_ring: boolean "Renders rings over halo" - + * MaterialHalo.soft -> use_soft: boolean "Softens the edges of halos at intersections with other geometry" - + * MaterialHalo.star -> use_star: boolean "Renders halo as a star" - + * MaterialHalo.texture -> use_texture: boolean "Gives halo a texture" - + * MaterialHalo.vertex_normal -> use_vertex_normal: boolean "Uses the vertex normal to specify the dimension of the halo" - + * MaterialPhysics.damp -> damping: float "Damping of the spring force, when inside the physics distance area" +#MaterialHalo.star_tip_count -> star_tip_count: int "Sets the number of points on the star shaped halo" +#MaterialHalo.use_extreme_alpha -> use_extreme_alpha: boolean "Uses extreme alpha" +#MaterialHalo.use_flare_mode -> use_flare_mode: boolean "Renders halo as a lensflare" +#MaterialHalo.use_lines -> use_lines: boolean "Renders star shaped lines over halo" +#MaterialHalo.use_ring -> use_ring: boolean "Renders rings over halo" +#MaterialHalo.use_soft -> use_soft: boolean "Softens the edges of halos at intersections with other geometry" +#MaterialHalo.use_star -> use_star: boolean "Renders halo as a star" +#MaterialHalo.use_texture -> use_texture: boolean "Gives halo a texture" +#MaterialHalo.use_vertex_normal -> use_vertex_normal: boolean "Uses the vertex normal to specify the dimension of the halo" +#MaterialPhysics.damping -> damping: float "Damping of the spring force, when inside the physics distance area" #+ * MaterialPhysics.distance -> distance: float "Distance of the physics area" #+ * MaterialPhysics.elasticity -> elasticity: float "Elasticity of collisions" #+ * MaterialPhysics.force -> force: float "Upward spring force, when inside the physics distance area" #+ * MaterialPhysics.friction -> friction: float "Coulomb friction coefficient, when inside the physics distance area" - + * MaterialPhysics.align_to_normal -> use_normal_align: boolean "Align dynamic game objects along the surface normal, when inside the physics distance area" +#MaterialPhysics.use_normal_align -> use_normal_align: boolean "Align dynamic game objects along the surface normal, when inside the physics distance area" #+ * MaterialRaytraceMirror.depth -> depth: int "Maximum allowed number of light inter-reflections" #+ * MaterialRaytraceMirror.distance -> distance: float "Maximum distance of reflected rays. Reflections further than this range fade to sky color or material color" #+ * MaterialRaytraceMirror.fade_to -> fade_to: enum "The color that rays with no intersection within the Max Distance take. Material color can be best for indoor scenes, sky color for outdoor" @@ -2092,7 +2092,7 @@ #+ * MaterialRaytraceMirror.reflect_factor -> reflect_factor: float "Sets the amount mirror reflection for raytrace" #+ * MaterialRaytraceMirror.use -> use: boolean "Enable raytraced reflections" #+ * MaterialRaytraceTransparency.depth -> depth: int "Maximum allowed number of light inter-refractions" - + * MaterialRaytraceTransparency.limit -> depth_max: float "Maximum depth for light to travel through the transparent material before becoming fully filtered (0.0 is disabled)" +#MaterialRaytraceTransparency.depth_max -> depth_max: float "Maximum depth for light to travel through the transparent material before becoming fully filtered (0.0 is disabled)" #+ * MaterialRaytraceTransparency.falloff -> falloff: float "Falloff power for transmissivity filter effect (1.0 is linear)" #+ * MaterialRaytraceTransparency.filter -> filter: float "Amount to blend in the materials diffuse color in raytraced transparency (simulating absorption)" #+ * MaterialRaytraceTransparency.fresnel -> fresnel: float "Power of Fresnel for transparency (Ray or ZTransp)" @@ -2107,17 +2107,17 @@ #+ * MaterialStrand.blend_distance -> blend_distance: float "Worldspace distance over which to blend in the surface normal" #+ * MaterialStrand.root_size -> root_size: float "Start size of strands in pixels or Blender units" #+ * MaterialStrand.shape -> shape: float "Positive values make strands rounder, negative makes strands spiky" - + * MaterialStrand.min_size -> size_min: float "Minimum size of strands in pixels" +#MaterialStrand.size_min -> size_min: float "Minimum size of strands in pixels" #+ * MaterialStrand.tip_size -> tip_size: float "End size of strands in pixels or Blender units" - + * MaterialStrand.blender_units -> use_blender_units: boolean "Use Blender units for widths instead of pixels" - + * MaterialStrand.surface_diffuse -> use_surface_diffuse: boolean "Make diffuse shading more similar to shading the surface" - + * MaterialStrand.tangent_shading -> use_tangent_shading: boolean "Uses direction of strands as normal for tangent-shading" +#MaterialStrand.use_blender_units -> use_blender_units: boolean "Use Blender units for widths instead of pixels" +#MaterialStrand.use_surface_diffuse -> use_surface_diffuse: boolean "Make diffuse shading more similar to shading the surface" +#MaterialStrand.use_tangent_shading -> use_tangent_shading: boolean "Uses direction of strands as normal for tangent-shading" #+ * MaterialStrand.uv_layer -> uv_layer: string "Name of UV layer to override" #+ * MaterialStrand.width_fade -> width_fade: float "Transparency along the width of the strand" #+ * MaterialSubsurfaceScattering.back -> back: float "Back scattering weight" #+ * MaterialSubsurfaceScattering.color -> color: float[3] "Scattering color" #+ * MaterialSubsurfaceScattering.color_factor -> color_factor: float "Blend factor for SSS colors" - + * MaterialSubsurfaceScattering.error_tolerance -> error_threshold: float "Error tolerance (low values are slower and higher quality)" +#MaterialSubsurfaceScattering.error_threshold -> error_threshold: float "Error tolerance (low values are slower and higher quality)" #+ * MaterialSubsurfaceScattering.front -> front: float "Front scattering weight" #+ * MaterialSubsurfaceScattering.ior -> ior: float "Index of refraction (higher values are denser)" #+ * MaterialSubsurfaceScattering.radius -> radius: float[3] "Mean red/green/blue scattering path length" @@ -2128,21 +2128,21 @@ #+ * MaterialVolume.cache_resolution -> cache_resolution: int "Resolution of the voxel grid, low resolutions are faster, high resolutions use more memory" #+ * MaterialVolume.density -> density: float "The base density of the volume" #+ * MaterialVolume.density_scale -> density_scale: float "Multiplier for the materials density" - + * MaterialVolume.depth_cutoff -> depth_threshold: float "Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy" +#MaterialVolume.depth_threshold -> depth_threshold: float "Stop ray marching early if transmission drops below this luminance - higher values give speedups in dense volumes at the expense of accuracy" #+ * MaterialVolume.emission -> emission: float "Amount of light that gets emitted by the volume" #+ * MaterialVolume.emission_color -> emission_color: float[3] "NO DESCRIPTION" - + * MaterialVolume.lighting_mode -> light_method: enum "Method of shading, attenuating, and scattering light through the volume" +#MaterialVolume.light_method -> light_method: enum "Method of shading, attenuating, and scattering light through the volume" #+ * MaterialVolume.ms_diffusion -> ms_diffusion: float "Diffusion factor, the strength of the blurring effect" #+ * MaterialVolume.ms_intensity -> ms_intensity: float "Multiplier for multiple scattered light energy" #+ * MaterialVolume.ms_spread -> ms_spread: float "Proportional distance over which the light is diffused" #+ * MaterialVolume.reflection -> reflection: float "Multiplier to make out-scattered light brighter or darker (non-physically correct)" #+ * MaterialVolume.reflection_color -> reflection_color: float[3] "Colour of light scattered out of the volume (does not affect transmission)" #+ * MaterialVolume.scattering -> scattering: float "Amount of light that gets scattered out by the volume - the more out-scattering, the shallower the light will penetrate" - + * MaterialVolume.step_calculation -> step_method: enum "Method of calculating the steps through the volume" +#MaterialVolume.step_method -> step_method: enum "Method of calculating the steps through the volume" #+ * MaterialVolume.step_size -> step_size: float "Distance between subsequent volume depth samples" #+ * MaterialVolume.transmission_color -> transmission_color: float[3] "Result color of the volume, after other light has been scattered/absorbed" - + * MaterialVolume.external_shadows -> use_external_shadows: boolean "Receive shadows from sources outside the volume (temporary)" - + * MaterialVolume.light_cache -> use_light_cache: boolean "Pre-calculate the shading information into a voxel grid, speeds up shading at slightly less accuracy" +#MaterialVolume.use_external_shadows -> use_external_shadows: boolean "Receive shadows from sources outside the volume (temporary)" +#MaterialVolume.use_light_cache -> use_light_cache: boolean "Pre-calculate the shading information into a voxel grid, speeds up shading at slightly less accuracy" #+ * Menu.bl_idname -> bl_idname: string "If this is set, the menu gets a custom ID, otherwise it takes the name of the class used to define the panel. For example, if the class name is OBJECT_MT_hello, and bl_idname is not set by the script, then bl_idname = OBJECT_MT_hello" #+ * Menu.bl_label -> bl_label: string "The menu label" #+ * Menu.layout -> layout: pointer, "(read-only) Defines the structure of the menu in the UI." @@ -2161,8 +2161,8 @@ #MeshEdge.is_fgon -> is_fgon: boolean "Fgon edge" #MeshEdge.is_loose -> is_loose: boolean "Loose edge" #+ * MeshEdge.select -> select: boolean "NO DESCRIPTION" +#MeshEdge.use_edge_sharp -> use_edge_sharp: boolean "Sharp edge for the EdgeSplit modifier" #MeshEdge.use_seam -> use_seam: boolean "Seam edge for UV unwrapping" -#MeshEdge.use_sharp -> use_sharp: boolean "Sharp edge for the EdgeSplit modifier" #MeshEdge.vertices -> vertices: int[2] "Vertex indices" #+ * MeshFace.area -> area: float, "(read-only) read only area of the face" #+ * MeshFace.hide -> hide: boolean "NO DESCRIPTION" @@ -2185,22 +2185,22 @@ #+ * MeshStringProperty.value -> value: string "NO DESCRIPTION" #+ * MeshStringPropertyLayer.data -> data: collection, "(read-only)" #+ * MeshStringPropertyLayer.name -> name: string "NO DESCRIPTION" - + * MeshTextureFace.transp -> alpha_mode: enum "Transparency blending mode" - + * MeshTextureFace.invisible -> hide: boolean "Make face invisible" +#MeshTextureFace.blend_type -> blend_type: enum "Transparency blending mode" +#MeshTextureFace.hide -> hide: boolean "Make face invisible" #+ * MeshTextureFace.image -> image: pointer "NO DESCRIPTION" - + * MeshTextureFace.uv_pinned -> pin_uv: boolean[4] "NO DESCRIPTION" +#MeshTextureFace.pin_uv -> pin_uv: boolean[4] "NO DESCRIPTION" #+ * MeshTextureFace.select_uv -> select_uv: boolean[4] "NO DESCRIPTION" - + * MeshTextureFace.alpha_sort -> use_alpha_sort: boolean "Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible)" - + * MeshTextureFace.billboard -> use_billboard: boolean "Billboard with Z-axis constraint" - + * MeshTextureFace.text -> use_bitmap_text: boolean "Enable bitmap text on face" - + * MeshTextureFace.shared -> use_blend_shared: boolean "Blend vertex colors across face when vertices are shared" - + * MeshTextureFace.collision -> use_collision: boolean "Use face for collision and ray-sensor detection" - + * MeshTextureFace.halo -> use_halo: boolean "Screen aligned billboard" - + * MeshTextureFace.light -> use_light: boolean "Use light for face" - + * MeshTextureFace.object_color -> use_object_color: boolean "Use ObColor instead of vertex colors" - + * MeshTextureFace.shadow -> use_shadow_face: boolean "Face is used for shadow" - + * MeshTextureFace.tex -> use_texture: boolean "Render face with texture" - + * MeshTextureFace.twoside -> use_twoside: boolean "Render face two-sided" +#MeshTextureFace.use_alpha_sort -> use_alpha_sort: boolean "Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible)" +#MeshTextureFace.use_billboard -> use_billboard: boolean "Billboard with Z-axis constraint" +#MeshTextureFace.use_bitmap_text -> use_bitmap_text: boolean "Enable bitmap text on face" +#MeshTextureFace.use_blend_shared -> use_blend_shared: boolean "Blend vertex colors across face when vertices are shared" +#MeshTextureFace.use_collision -> use_collision: boolean "Use face for collision and ray-sensor detection" +#MeshTextureFace.use_halo -> use_halo: boolean "Screen aligned billboard" +#MeshTextureFace.use_image -> use_image: boolean "Render face with texture" +#MeshTextureFace.use_light -> use_light: boolean "Use light for face" +#MeshTextureFace.use_object_color -> use_object_color: boolean "Use ObColor instead of vertex colors" +#MeshTextureFace.use_shadow_cast -> use_shadow_cast: boolean "Face is used for shadow" +#MeshTextureFace.use_twoside -> use_twoside: boolean "Render face two-sided" #+ * MeshTextureFace.uv -> uv: float[8] "NO DESCRIPTION" #+ * MeshTextureFace.uv1 -> uv1: float[2] "NO DESCRIPTION" #+ * MeshTextureFace.uv2 -> uv2: float[2] "NO DESCRIPTION" @@ -2233,52 +2233,52 @@ #Modifier.show_expanded -> show_expanded: boolean "Set modifier expanded in the user interface" #Modifier.show_in_editmode -> show_in_editmode: boolean "Use modifier while in the edit mode" #Modifier.show_on_cage -> show_on_cage: boolean "Enable direct editing of modifier control cage" +#Modifier.show_render -> show_render: boolean "Use modifier during rendering" #Modifier.show_viewport -> show_viewport: boolean "Realtime display of a modifier" #+ * Modifier.type -> type: enum, "(read-only)" - + * Modifier.render -> use_render: boolean "Use modifier during rendering" - + * Modifier|ArmatureModifier.invert -> invert_vertex_group: boolean "Invert vertex group influence" +#Modifier|ArmatureModifier.invert_vertex_group -> invert_vertex_group: boolean "Invert vertex group influence" #+ * Modifier|ArmatureModifier.object -> object: pointer "Armature object to deform with" #+ * Modifier|ArmatureModifier.use_bone_envelopes -> use_bone_envelopes: boolean "NO DESCRIPTION" - + * Modifier|ArmatureModifier.quaternion -> use_deform_preserve_volume: boolean "Deform rotation interpolation with quaternions" - + * Modifier|ArmatureModifier.multi_modifier -> use_multi_modifier: boolean "Use same input as previous modifier, and mix results using overall vgroup" +#Modifier|ArmatureModifier.use_deform_preserve_volume -> use_deform_preserve_volume: boolean "Deform rotation interpolation with quaternions" +#Modifier|ArmatureModifier.use_multi_modifier -> use_multi_modifier: boolean "Use same input as previous modifier, and mix results using overall vgroup" #+ * Modifier|ArmatureModifier.use_vertex_groups -> use_vertex_groups: boolean "NO DESCRIPTION" #+ * Modifier|ArmatureModifier.vertex_group -> vertex_group: string "Vertex group name" - + * Modifier|ArrayModifier.constant_offset_displacement -> constant_offset_displace: float[3] "NO DESCRIPTION" +#Modifier|ArrayModifier.constant_offset_displace -> constant_offset_displace: float[3] "NO DESCRIPTION" #+ * Modifier|ArrayModifier.count -> count: int "Number of duplicates to make" #+ * Modifier|ArrayModifier.curve -> curve: pointer "Curve object to fit array length to" #+ * Modifier|ArrayModifier.end_cap -> end_cap: pointer "Mesh object to use as an end cap" - + * Modifier|ArrayModifier.length -> fit_length: float "Length to fit array within" +#Modifier|ArrayModifier.fit_length -> fit_length: float "Length to fit array within" #+ * Modifier|ArrayModifier.fit_type -> fit_type: enum "Array length calculation method" - + * Modifier|ArrayModifier.merge_distance -> merge_threshold: float "Limit below which to merge vertices" +#Modifier|ArrayModifier.merge_threshold -> merge_threshold: float "Limit below which to merge vertices" #+ * Modifier|ArrayModifier.offset_object -> offset_object: pointer "NO DESCRIPTION" - + * Modifier|ArrayModifier.relative_offset_displacement -> relative_offset_displace: float[3] "NO DESCRIPTION" +#Modifier|ArrayModifier.relative_offset_displace -> relative_offset_displace: float[3] "NO DESCRIPTION" #+ * Modifier|ArrayModifier.start_cap -> start_cap: pointer "Mesh object to use as a start cap" - + * Modifier|ArrayModifier.constant_offset -> use_constant_offset: boolean "Add a constant offset" - + * Modifier|ArrayModifier.merge_adjacent_vertices -> use_merge_vertices: boolean "Merge vertices in adjacent duplicates" - + * Modifier|ArrayModifier.merge_end_vertices -> use_merge_vertices_cap: boolean "Merge vertices in first and last duplicates" - + * Modifier|ArrayModifier.add_offset_object -> use_object_offset: boolean "Add another objects transformation to the total offset" - + * Modifier|ArrayModifier.relative_offset -> use_relative_offset: boolean "Add an offset relative to the objects bounding box" - + * Modifier|BevelModifier.angle -> angle_limit: float "Angle above which to bevel edges" +#Modifier|ArrayModifier.use_constant_offset -> use_constant_offset: boolean "Add a constant offset" +#Modifier|ArrayModifier.use_merge_vertices -> use_merge_vertices: boolean "Merge vertices in adjacent duplicates" +#Modifier|ArrayModifier.use_merge_vertices_cap -> use_merge_vertices_cap: boolean "Merge vertices in first and last duplicates" +#Modifier|ArrayModifier.use_object_offset -> use_object_offset: boolean "Add another objects transformation to the total offset" +#Modifier|ArrayModifier.use_relative_offset -> use_relative_offset: boolean "Add an offset relative to the objects bounding box" +#Modifier|BevelModifier.angle_limit -> angle_limit: float "Angle above which to bevel edges" #+ * Modifier|BevelModifier.edge_weight_method -> edge_weight_method: enum "What edge weight to use for weighting a vertex" #+ * Modifier|BevelModifier.limit_method -> limit_method: enum "NO DESCRIPTION" - + * Modifier|BevelModifier.only_vertices -> use_only_vertices: boolean "Bevel verts/corners, not edges" +#Modifier|BevelModifier.use_only_vertices -> use_only_vertices: boolean "Bevel verts/corners, not edges" #+ * Modifier|BevelModifier.width -> width: float "Bevel value/amount" #+ * Modifier|BooleanModifier.object -> object: pointer "Mesh object to use for Boolean operation" #+ * Modifier|BooleanModifier.operation -> operation: enum "NO DESCRIPTION" - + * Modifier|BuildModifier.length -> frame_duration: float "Specify the total time the build effect requires" +#Modifier|BuildModifier.frame_duration -> frame_duration: float "Specify the total time the build effect requires" #+ * Modifier|BuildModifier.frame_start -> frame_start: float "Specify the start frame of the effect" #+ * Modifier|BuildModifier.seed -> seed: int "Specify the seed for random if used" - + * Modifier|BuildModifier.randomize -> use_random_order: boolean "Randomize the faces or edges during build" +#Modifier|BuildModifier.use_random_order -> use_random_order: boolean "Randomize the faces or edges during build" #+ * Modifier|CastModifier.cast_type -> cast_type: enum "NO DESCRIPTION" #+ * Modifier|CastModifier.factor -> factor: float "NO DESCRIPTION" #+ * Modifier|CastModifier.object -> object: pointer "Control object: if available, its location determines the center of the effect" #+ * Modifier|CastModifier.radius -> radius: float "Only deform vertices within this distance from the center of the effect (leave as 0 for infinite.)" #+ * Modifier|CastModifier.size -> size: float "Size of projection shape (leave as 0 for auto.)" - + * Modifier|CastModifier.from_radius -> use_radius_as_size: boolean "Use radius as size of projection shape (0 = auto)" +#Modifier|CastModifier.use_radius_as_size -> use_radius_as_size: boolean "Use radius as size of projection shape (0 = auto)" #+ * Modifier|CastModifier.use_transform -> use_transform: boolean "Use object transform to control projection shape" - + * Modifier|CastModifier.x -> use_x: boolean "NO DESCRIPTION" - + * Modifier|CastModifier.y -> use_y: boolean "NO DESCRIPTION" - + * Modifier|CastModifier.z -> use_z: boolean "NO DESCRIPTION" +#Modifier|CastModifier.use_x -> use_x: boolean "NO DESCRIPTION" +#Modifier|CastModifier.use_y -> use_y: boolean "NO DESCRIPTION" +#Modifier|CastModifier.use_z -> use_z: boolean "NO DESCRIPTION" #+ * Modifier|CastModifier.vertex_group -> vertex_group: string "Vertex group name" #+ * Modifier|ClothModifier.collision_settings -> collision_settings: pointer, "(read-only)" #+ * Modifier|ClothModifier.point_cache -> point_cache: pointer, "(read-only)" @@ -2290,22 +2290,22 @@ #+ * Modifier|DecimateModifier.face_count -> face_count: int, "(read-only) The current number of faces in the decimated mesh" #+ * Modifier|DecimateModifier.ratio -> ratio: float "Defines the ratio of triangles to reduce to" #+ * Modifier|DisplaceModifier.direction -> direction: enum "NO DESCRIPTION" - + * Modifier|DisplaceModifier.midlevel -> mid_level: float "Material value that gives no displacement" +#Modifier|DisplaceModifier.mid_level -> mid_level: float "Material value that gives no displacement" #+ * Modifier|DisplaceModifier.strength -> strength: float "NO DESCRIPTION" #+ * Modifier|DisplaceModifier.texture -> texture: pointer "NO DESCRIPTION" #+ * Modifier|DisplaceModifier.texture_coordinate_object -> texture_coordinate_object: pointer "NO DESCRIPTION" - + * Modifier|DisplaceModifier.texture_coordinates -> texture_coords: enum "NO DESCRIPTION" +#Modifier|DisplaceModifier.texture_coords -> texture_coords: enum "NO DESCRIPTION" #+ * Modifier|DisplaceModifier.uv_layer -> uv_layer: string "UV layer name" #+ * Modifier|DisplaceModifier.vertex_group -> vertex_group: string "Vertex group name" #+ * Modifier|EdgeSplitModifier.split_angle -> split_angle: float "Angle above which to split edges" #+ * Modifier|EdgeSplitModifier.use_edge_angle -> use_edge_angle: boolean "Split edges with high angle between faces" - + * Modifier|EdgeSplitModifier.use_sharp -> use_edge_sharp: boolean "Split edges that are marked as sharp" +#Modifier|EdgeSplitModifier.use_edge_sharp -> use_edge_sharp: boolean "Split edges that are marked as sharp" #+ * Modifier|ExplodeModifier.protect -> protect: float "Clean vertex group edges" #Modifier|ExplodeModifier.show_alive -> show_alive: boolean "Show mesh when particles are alive" #Modifier|ExplodeModifier.show_dead -> show_dead: boolean "Show mesh when particles are dead" #Modifier|ExplodeModifier.show_unborn -> show_unborn: boolean "Show mesh when particles are unborn" - + * Modifier|ExplodeModifier.split_edges -> use_edge_split: boolean "Split face edges for nicer shrapnel" - + * Modifier|ExplodeModifier.size -> use_size: boolean "Use particle size for the shrapnel" +#Modifier|ExplodeModifier.use_edge_split -> use_edge_split: boolean "Split face edges for nicer shrapnel" +#Modifier|ExplodeModifier.use_size -> use_size: boolean "Use particle size for the shrapnel" #+ * Modifier|ExplodeModifier.vertex_group -> vertex_group: string "NO DESCRIPTION" #+ * Modifier|FluidSimulationModifier.settings -> settings: pointer, "(read-only) Settings for how this object is used in the fluid simulation" #+ * Modifier|HookModifier.falloff -> falloff: float "If not zero, the distance from the hook where influence ends" @@ -2316,26 +2316,26 @@ #+ * Modifier|LatticeModifier.object -> object: pointer "Lattice object to deform with" #+ * Modifier|LatticeModifier.vertex_group -> vertex_group: string "Vertex group name" #+ * Modifier|MaskModifier.armature -> armature: pointer "Armature to use as source of bones to mask" - + * Modifier|MaskModifier.invert -> invert_vertex_group: boolean "Use vertices that are not part of region defined" +#Modifier|MaskModifier.invert_vertex_group -> invert_vertex_group: boolean "Use vertices that are not part of region defined" #+ * Modifier|MaskModifier.mode -> mode: enum "NO DESCRIPTION" #+ * Modifier|MaskModifier.vertex_group -> vertex_group: string "Vertex group name" - + * Modifier|MeshDeformModifier.invert -> invert_vertex_group: boolean "Invert vertex group influence" +#Modifier|MeshDeformModifier.invert_vertex_group -> invert_vertex_group: boolean "Invert vertex group influence" #+ * Modifier|MeshDeformModifier.is_bound -> is_bound: boolean, "(read-only) Whether geometry has been bound to control cage" #+ * Modifier|MeshDeformModifier.object -> object: pointer "Mesh object to deform with" #+ * Modifier|MeshDeformModifier.precision -> precision: int "The grid size for binding" - + * Modifier|MeshDeformModifier.dynamic -> use_dynamic_bind: boolean "Recompute binding dynamically on top of other deformers (slower and more memory consuming.)" +#Modifier|MeshDeformModifier.use_dynamic_bind -> use_dynamic_bind: boolean "Recompute binding dynamically on top of other deformers (slower and more memory consuming.)" #+ * Modifier|MeshDeformModifier.vertex_group -> vertex_group: string "Vertex group name" - + * Modifier|MirrorModifier.merge_limit -> merge_threshold: float "Distance from axis within which mirrored vertices are merged" +#Modifier|MirrorModifier.merge_threshold -> merge_threshold: float "Distance from axis within which mirrored vertices are merged" #+ * Modifier|MirrorModifier.mirror_object -> mirror_object: pointer "Object to use as mirror" - + * Modifier|MirrorModifier.clip -> use_clip: boolean "Prevents vertices from going through the mirror during transform" - + * Modifier|MirrorModifier.mirror_u -> use_mirror_u: boolean "Mirror the U texture coordinate around the 0.5 point" - + * Modifier|MirrorModifier.mirror_v -> use_mirror_v: boolean "Mirror the V texture coordinate around the 0.5 point" - + * Modifier|MirrorModifier.mirror_vertex_groups -> use_mirror_vertex_groups: boolean "Mirror vertex groups (e.g. .R->.L)" - + * Modifier|MirrorModifier.x -> use_x: boolean "Enable X axis mirror" - + * Modifier|MirrorModifier.y -> use_y: boolean "Enable Y axis mirror" - + * Modifier|MirrorModifier.z -> use_z: boolean "Enable Z axis mirror" +#Modifier|MirrorModifier.use_clip -> use_clip: boolean "Prevents vertices from going through the mirror during transform" +#Modifier|MirrorModifier.use_mirror_u -> use_mirror_u: boolean "Mirror the U texture coordinate around the 0.5 point" +#Modifier|MirrorModifier.use_mirror_v -> use_mirror_v: boolean "Mirror the V texture coordinate around the 0.5 point" +#Modifier|MirrorModifier.use_mirror_vertex_groups -> use_mirror_vertex_groups: boolean "Mirror vertex groups (e.g. .R->.L)" +#Modifier|MirrorModifier.use_x -> use_x: boolean "Enable X axis mirror" +#Modifier|MirrorModifier.use_y -> use_y: boolean "Enable Y axis mirror" +#Modifier|MirrorModifier.use_z -> use_z: boolean "Enable Z axis mirror" #+ * Modifier|MultiresModifier.filepath -> filepath: string "Path to external displacements file" - + * Modifier|MultiresModifier.external -> is_external: boolean, "(read-only) Store multires displacements outside the .blend file, to save memory" +#Modifier|MultiresModifier.is_external -> is_external: boolean, "(read-only) Store multires displacements outside the .blend file, to save memory" #+ * Modifier|MultiresModifier.levels -> levels: int "Number of subdivisions to use in the viewport" #+ * Modifier|MultiresModifier.render_levels -> render_levels: int "NO DESCRIPTION" #+ * Modifier|MultiresModifier.sculpt_levels -> sculpt_levels: int "Number of subdivisions to use in sculpt mode" @@ -2344,17 +2344,17 @@ #+ * Modifier|MultiresModifier.total_levels -> total_levels: int, "(read-only) Number of subdivisions for which displacements are stored" #+ * Modifier|ParticleInstanceModifier.axis -> axis: enum "Pole axis for rotation" #+ * Modifier|ParticleInstanceModifier.object -> object: pointer "Object that has the particle system" - + * Modifier|ParticleInstanceModifier.particle_system_number -> particle_system_index: int "NO DESCRIPTION" +#Modifier|ParticleInstanceModifier.particle_system_index -> particle_system_index: int "NO DESCRIPTION" #+ * Modifier|ParticleInstanceModifier.position -> position: float "Position along path" #+ * Modifier|ParticleInstanceModifier.random_position -> random_position: float "Randomize position along path" #Modifier|ParticleInstanceModifier.show_alive -> show_alive: boolean "Show instances when particles are alive" #Modifier|ParticleInstanceModifier.show_dead -> show_dead: boolean "Show instances when particles are dead" #Modifier|ParticleInstanceModifier.show_unborn -> show_unborn: boolean "Show instances when particles are unborn" - + * Modifier|ParticleInstanceModifier.children -> use_children: boolean "Create instances from child particles" - + * Modifier|ParticleInstanceModifier.normal -> use_normal: boolean "Create instances from normal particles" +#Modifier|ParticleInstanceModifier.use_children -> use_children: boolean "Create instances from child particles" +#Modifier|ParticleInstanceModifier.use_normal -> use_normal: boolean "Create instances from normal particles" #+ * Modifier|ParticleInstanceModifier.use_path -> use_path: boolean "Create instances along particle paths" - + * Modifier|ParticleInstanceModifier.keep_shape -> use_preserve_shape: boolean "Dont stretch the object" - + * Modifier|ParticleInstanceModifier.size -> use_size: boolean "Use particle size to scale the instances" +#Modifier|ParticleInstanceModifier.use_preserve_shape -> use_preserve_shape: boolean "Dont stretch the object" +#Modifier|ParticleInstanceModifier.use_size -> use_size: boolean "Use particle size to scale the instances" #+ * Modifier|ParticleSystemModifier.particle_system -> particle_system: pointer, "(read-only) Particle System that this modifier controls" #+ * Modifier|ScrewModifier.angle -> angle: float "Angle of revolution" #+ * Modifier|ScrewModifier.axis -> axis: enum "Screw axis" @@ -2370,40 +2370,40 @@ #+ * Modifier|ShrinkwrapModifier.offset -> offset: float "Distance to keep from the target" #+ * Modifier|ShrinkwrapModifier.subsurf_levels -> subsurf_levels: int "Number of subdivisions that must be performed before extracting vertices positions and normals" #+ * Modifier|ShrinkwrapModifier.target -> target: pointer "Mesh target to shrink to" - + * Modifier|ShrinkwrapModifier.cull_back_faces -> use_cull_back_faces: boolean "Stop vertices from projecting to a back face on the target" - + * Modifier|ShrinkwrapModifier.cull_front_faces -> use_cull_front_faces: boolean "Stop vertices from projecting to a front face on the target" - + * Modifier|ShrinkwrapModifier.keep_above_surface -> use_keep_above_surface: boolean "NO DESCRIPTION" - + * Modifier|ShrinkwrapModifier.negative -> use_negative_direction: boolean "Allow vertices to move in the negative direction of axis" - + * Modifier|ShrinkwrapModifier.positive -> use_positive_direction: boolean "Allow vertices to move in the positive direction of axis" - + * Modifier|ShrinkwrapModifier.x -> use_project_x: boolean "NO DESCRIPTION" - + * Modifier|ShrinkwrapModifier.y -> use_project_y: boolean "NO DESCRIPTION" - + * Modifier|ShrinkwrapModifier.z -> use_project_z: boolean "NO DESCRIPTION" +#Modifier|ShrinkwrapModifier.use_cull_back_faces -> use_cull_back_faces: boolean "Stop vertices from projecting to a back face on the target" +#Modifier|ShrinkwrapModifier.use_cull_front_faces -> use_cull_front_faces: boolean "Stop vertices from projecting to a front face on the target" +#Modifier|ShrinkwrapModifier.use_keep_above_surface -> use_keep_above_surface: boolean "NO DESCRIPTION" +#Modifier|ShrinkwrapModifier.use_negative_direction -> use_negative_direction: boolean "Allow vertices to move in the negative direction of axis" +#Modifier|ShrinkwrapModifier.use_positive_direction -> use_positive_direction: boolean "Allow vertices to move in the positive direction of axis" +#Modifier|ShrinkwrapModifier.use_project_x -> use_project_x: boolean "NO DESCRIPTION" +#Modifier|ShrinkwrapModifier.use_project_y -> use_project_y: boolean "NO DESCRIPTION" +#Modifier|ShrinkwrapModifier.use_project_z -> use_project_z: boolean "NO DESCRIPTION" #+ * Modifier|ShrinkwrapModifier.vertex_group -> vertex_group: string "Vertex group name" - + * Modifier|ShrinkwrapModifier.mode -> wrap_method: enum "NO DESCRIPTION" - + * Modifier|SimpleDeformModifier.mode -> deform_method: enum "NO DESCRIPTION" +#Modifier|ShrinkwrapModifier.wrap_method -> wrap_method: enum "NO DESCRIPTION" +#Modifier|SimpleDeformModifier.deform_method -> deform_method: enum "NO DESCRIPTION" #+ * Modifier|SimpleDeformModifier.factor -> factor: float "NO DESCRIPTION" #+ * Modifier|SimpleDeformModifier.limits -> limits: float[2] "Lower/Upper limits for deform" - + * Modifier|SimpleDeformModifier.lock_x_axis -> lock_x: boolean "NO DESCRIPTION" - + * Modifier|SimpleDeformModifier.lock_y_axis -> lock_y: boolean "NO DESCRIPTION" +#Modifier|SimpleDeformModifier.lock_x -> lock_x: boolean "NO DESCRIPTION" +#Modifier|SimpleDeformModifier.lock_y -> lock_y: boolean "NO DESCRIPTION" #+ * Modifier|SimpleDeformModifier.origin -> origin: pointer "Origin of modifier space coordinates" - + * Modifier|SimpleDeformModifier.relative -> use_relative: boolean "Sets the origin of deform space to be relative to the object" +#Modifier|SimpleDeformModifier.use_relative -> use_relative: boolean "Sets the origin of deform space to be relative to the object" #+ * Modifier|SimpleDeformModifier.vertex_group -> vertex_group: string "Vertex group name" #+ * 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|SmokeModifier.smoke_type -> smoke_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" - + * Modifier|SmoothModifier.y -> use_y: boolean "NO DESCRIPTION" - + * Modifier|SmoothModifier.z -> use_z: boolean "NO DESCRIPTION" +#Modifier|SmoothModifier.ise_x -> ise_x: boolean "NO DESCRIPTION" +#Modifier|SmoothModifier.ise_y -> ise_y: boolean "NO DESCRIPTION" +#Modifier|SmoothModifier.ise_z -> ise_z: boolean "NO DESCRIPTION" +#Modifier|SmoothModifier.iterations -> iterations: int "NO DESCRIPTION" #+ * Modifier|SmoothModifier.vertex_group -> vertex_group: string "Vertex group name" #+ * Modifier|SoftBodyModifier.point_cache -> point_cache: pointer, "(read-only)" #+ * Modifier|SoftBodyModifier.settings -> settings: pointer, "(read-only)" #+ * Modifier|SolidifyModifier.edge_crease_inner -> edge_crease_inner: float "Assign a crease to inner edges" #+ * Modifier|SolidifyModifier.edge_crease_outer -> edge_crease_outer: float "Assign a crease to outer edges" #+ * Modifier|SolidifyModifier.edge_crease_rim -> edge_crease_rim: float "Assign a crease to the edges making up the rim" - + * Modifier|SolidifyModifier.invert -> invert_vertex_group: boolean "Invert the vertex group influence" +#Modifier|SolidifyModifier.invert_vertex_group -> invert_vertex_group: boolean "Invert the vertex group influence" #+ * Modifier|SolidifyModifier.offset -> offset: float "Offset the thickness from the center" #+ * Modifier|SolidifyModifier.thickness -> thickness: float "Thickness of the shell" #+ * Modifier|SolidifyModifier.use_even_offset -> use_even_offset: boolean "Maintain thickness by adjusting for sharp corners (slow, disable when not needed)" @@ -2415,15 +2415,15 @@ #+ * Modifier|SubsurfModifier.render_levels -> render_levels: int "Number of subdivisions to perform when rendering" #Modifier|SubsurfModifier.show_only_control_edges -> show_only_control_edges: boolean "Skip drawing/rendering of interior subdivided edges" #+ * Modifier|SubsurfModifier.subdivision_type -> subdivision_type: enum "Selects type of subdivision algorithm" - + * Modifier|SubsurfModifier.subsurf_uv -> use_subsurf_uv: boolean "Use subsurf to subdivide UVs" +#Modifier|SubsurfModifier.use_subsurf_uv -> use_subsurf_uv: boolean "Use subsurf to subdivide UVs" #+ * Modifier|UVProjectModifier.aspect_x -> aspect_x: float "NO DESCRIPTION" #+ * Modifier|UVProjectModifier.aspect_y -> aspect_y: float "NO DESCRIPTION" #+ * Modifier|UVProjectModifier.image -> image: pointer "NO DESCRIPTION" - + * Modifier|UVProjectModifier.num_projectors -> projector_count: int "Number of projectors to use" +#Modifier|UVProjectModifier.projector_count -> projector_count: int "Number of projectors to use" #+ * Modifier|UVProjectModifier.projectors -> projectors: collection, "(read-only)" #+ * Modifier|UVProjectModifier.scale_x -> scale_x: float "NO DESCRIPTION" #+ * Modifier|UVProjectModifier.scale_y -> scale_y: float "NO DESCRIPTION" - + * Modifier|UVProjectModifier.override_image -> use_image_override: boolean "Override faces current images with the given image" +#Modifier|UVProjectModifier.use_image_override -> use_image_override: boolean "Override faces current images with the given image" #+ * Modifier|UVProjectModifier.uv_layer -> uv_layer: string "UV layer name" #+ * Modifier|WaveModifier.damping_time -> damping_time: float "NO DESCRIPTION" #+ * Modifier|WaveModifier.falloff_radius -> falloff_radius: float "NO DESCRIPTION" @@ -2435,16 +2435,16 @@ #+ * Modifier|WaveModifier.start_position_x -> start_position_x: float "NO DESCRIPTION" #+ * Modifier|WaveModifier.start_position_y -> start_position_y: float "NO DESCRIPTION" #+ * Modifier|WaveModifier.texture -> texture: pointer "Texture for modulating the wave" - + * Modifier|WaveModifier.texture_coordinates -> texture_coords: enum "Texture coordinates used for modulating input" +#Modifier|WaveModifier.texture_coords -> texture_coords: enum "Texture coordinates used for modulating input" #Modifier|WaveModifier.texture_coords_object -> texture_coords_object: pointer "NO DESCRIPTION" #+ * Modifier|WaveModifier.time_offset -> time_offset: float "Either the starting frame (for positive speed) or ending frame (for negative speed.)" - + * Modifier|WaveModifier.cyclic -> use_cyclic: boolean "Cyclic wave effect" - + * Modifier|WaveModifier.normals -> use_normal: boolean "Displace along normals" - + * Modifier|WaveModifier.x_normal -> use_normal_x: boolean "Enable displacement along the X normal" - + * Modifier|WaveModifier.y_normal -> use_normal_y: boolean "Enable displacement along the Y normal" - + * Modifier|WaveModifier.z_normal -> use_normal_z: boolean "Enable displacement along the Z normal" - + * Modifier|WaveModifier.x -> use_x: boolean "X axis motion" - + * Modifier|WaveModifier.y -> use_y: boolean "Y axis motion" +#Modifier|WaveModifier.use_cyclic -> use_cyclic: boolean "Cyclic wave effect" +#Modifier|WaveModifier.use_normal -> use_normal: boolean "Displace along normals" +#Modifier|WaveModifier.use_normal_x -> use_normal_x: boolean "Enable displacement along the X normal" +#Modifier|WaveModifier.use_normal_y -> use_normal_y: boolean "Enable displacement along the Y normal" +#Modifier|WaveModifier.use_normal_z -> use_normal_z: boolean "Enable displacement along the Z normal" +#Modifier|WaveModifier.use_x -> use_x: boolean "X axis motion" +#Modifier|WaveModifier.use_y -> use_y: boolean "Y axis motion" #+ * Modifier|WaveModifier.uv_layer -> uv_layer: string "UV layer name" #+ * Modifier|WaveModifier.vertex_group -> vertex_group: string "Vertex group name for modulating the wave" #+ * Modifier|WaveModifier.width -> width: float "NO DESCRIPTION" @@ -2462,7 +2462,7 @@ #+ * NlaStrip.active -> active: boolean, "(read-only) NLA Strip is active" #+ * NlaStrip.blend_in -> blend_in: float "Number of frames at start of strip to fade in influence" #+ * NlaStrip.blend_out -> blend_out: float "NO DESCRIPTION" - + * NlaStrip.blending -> blend_type: enum "Method used for combining strips result with accumulated result" +#NlaStrip.blend_type -> blend_type: enum "Method used for combining strips result with accumulated result" #+ * NlaStrip.extrapolation -> extrapolation: enum "Action to take for gaps past the strip extents" #+ * NlaStrip.fcurves -> fcurves: collection, "(read-only) F-Curves for controlling the strips influence and timing" #+ * NlaStrip.frame_end -> frame_end: float "NO DESCRIPTION" @@ -2477,11 +2477,11 @@ #+ * NlaStrip.strip_time -> strip_time: float "Frame of referenced Action to evaluate" #+ * NlaStrip.strips -> strips: collection, "(read-only) NLA Strips that this strip acts as a container for (if it is of type Meta)" #+ * NlaStrip.type -> type: enum, "(read-only) Type of NLA Strip" - + * NlaStrip.animated_influence -> use_animated_influence: boolean "Influence setting is controlled by an F-Curve rather than automatically determined" - + * NlaStrip.animated_time -> use_animated_time: boolean "Strip time is controlled by an F-Curve rather than automatically determined" - + * NlaStrip.animated_time_cyclic -> use_animated_time_cyclic: boolean "Cycle the animated time within the action start & end" - + * NlaStrip.auto_blending -> use_auto_blend: boolean "Number of frames for Blending In/Out is automatically determined from overlapping strips" - + * NlaStrip.reversed -> use_reverse: boolean "NLA Strip is played back in reverse order (only when timing is automatically determined)" +#NlaStrip.use_animated_influence -> use_animated_influence: boolean "Influence setting is controlled by an F-Curve rather than automatically determined" +#NlaStrip.use_animated_time -> use_animated_time: boolean "Strip time is controlled by an F-Curve rather than automatically determined" +#NlaStrip.use_animated_time_cyclic -> use_animated_time_cyclic: boolean "Cycle the animated time within the action start & end" +#NlaStrip.use_auto_blend -> use_auto_blend: boolean "Number of frames for Blending In/Out is automatically determined from overlapping strips" +#NlaStrip.use_reverse -> use_reverse: boolean "NLA Strip is played back in reverse order (only when timing is automatically determined)" #+ * NlaTrack.active -> active: boolean, "(read-only) NLA Track is active" #NlaTrack.is_solo -> is_solo: boolean, "(read-only) NLA Track is evaluated itself (i.e. active Action and all other NLA Tracks in the same AnimData block are disabled)" #+ * NlaTrack.lock -> lock: boolean "NLA Track is locked" @@ -2495,7 +2495,7 @@ #+ * Node.outputs -> outputs: collection, "(read-only)" #+ * Node|CompositorNode.type -> type: enum, "(read-only)" #+ * Node|CompositorNode|CompositorNodeAlphaOver.premul -> premul: float "Mix Factor" - + * Node|CompositorNode|CompositorNodeAlphaOver.convert_premul -> use_premultiply: boolean "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeAlphaOver.use_premultiply -> use_premultiply: boolean "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeBilateralblur.iterations -> iterations: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeBilateralblur.sigma_color -> sigma_color: float "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeBilateralblur.sigma_space -> sigma_space: float "NO DESCRIPTION" @@ -2503,45 +2503,45 @@ #+ * Node|CompositorNode|CompositorNodeBlur.factor_x -> factor_x: float "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeBlur.factor_y -> factor_y: float "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeBlur.filter_type -> filter_type: enum "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeBlur.sizex -> size_x: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeBlur.sizey -> size_y: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeBlur.bokeh -> use_bokeh: boolean "Uses circular filter (slower)" - + * Node|CompositorNode|CompositorNodeBlur.gamma -> use_gamma_correction: boolean "Applies filter on gamma corrected values" - + * Node|CompositorNode|CompositorNodeBlur.relative -> use_relative: boolean "Use relative (percent) values to define blur radius" +#Node|CompositorNode|CompositorNodeBlur.size_x -> size_x: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeBlur.size_y -> size_y: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeBlur.use_bokeh -> use_bokeh: boolean "Uses circular filter (slower)" +#Node|CompositorNode|CompositorNodeBlur.use_gamma_correction -> use_gamma_correction: boolean "Applies filter on gamma corrected values" +#Node|CompositorNode|CompositorNodeBlur.use_relative -> use_relative: boolean "Use relative (percent) values to define blur radius" #+ * Node|CompositorNode|CompositorNodeChannelMatte.color_space -> color_space: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeChannelMatte.limit_channel -> limit_channel: enum "Limit by this channels value" - + * Node|CompositorNode|CompositorNodeChannelMatte.high -> limit_max: float "Values higher than this setting are 100% opaque" - + * Node|CompositorNode|CompositorNodeChannelMatte.algorithm -> limit_method: enum "Algorithm to use to limit channel" - + * Node|CompositorNode|CompositorNodeChannelMatte.low -> limit_min: float "Values lower than this setting are 100% keyed" - + * Node|CompositorNode|CompositorNodeChannelMatte.channel -> matte_channel: enum "Channel used to determine matte" +#Node|CompositorNode|CompositorNodeChannelMatte.limit_max -> limit_max: float "Values higher than this setting are 100% opaque" +#Node|CompositorNode|CompositorNodeChannelMatte.limit_method -> limit_method: enum "Algorithm to use to limit channel" +#Node|CompositorNode|CompositorNodeChannelMatte.limit_min -> limit_min: float "Values lower than this setting are 100% keyed" +#Node|CompositorNode|CompositorNodeChannelMatte.matte_channel -> matte_channel: enum "Channel used to determine matte" #+ * Node|CompositorNode|CompositorNodeChromaMatte.gain -> gain: float "Alpha gain" #+ * Node|CompositorNode|CompositorNodeChromaMatte.lift -> lift: float "Alpha lift" #+ * Node|CompositorNode|CompositorNodeChromaMatte.shadow_adjust -> shadow_adjust: float "Adjusts the brightness of any shadows captured" - + * Node|CompositorNode|CompositorNodeChromaMatte.cutoff -> threshold: float "Tolerance below which colors will be considered as exact matches" - + * Node|CompositorNode|CompositorNodeChromaMatte.acceptance -> tolerance: float "Tolerance for a color to be considered a keying color" - + * Node|CompositorNode|CompositorNodeColorBalance.correction_formula -> correction_method: enum "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeChromaMatte.threshold -> threshold: float "Tolerance below which colors will be considered as exact matches" +#Node|CompositorNode|CompositorNodeChromaMatte.tolerance -> tolerance: float "Tolerance for a color to be considered a keying color" +#Node|CompositorNode|CompositorNodeColorBalance.correction_method -> correction_method: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeColorBalance.gain -> gain: float[3] "Correction for Highlights" #+ * Node|CompositorNode|CompositorNodeColorBalance.gamma -> gamma: float[3] "Correction for Midtones" #+ * Node|CompositorNode|CompositorNodeColorBalance.lift -> lift: float[3] "Correction for Shadows" #+ * Node|CompositorNode|CompositorNodeColorBalance.offset -> offset: float[3] "Correction for Shadows" #+ * Node|CompositorNode|CompositorNodeColorBalance.power -> power: float[3] "Correction for Midtones" #+ * Node|CompositorNode|CompositorNodeColorBalance.slope -> slope: float[3] "Correction for Highlights" - + * Node|CompositorNode|CompositorNodeColorMatte.h -> color_hue: float "Hue tolerance for colors to be considered a keying color" - + * Node|CompositorNode|CompositorNodeColorMatte.s -> color_saturation: float "Saturation Tolerance for the color" - + * Node|CompositorNode|CompositorNodeColorMatte.v -> color_value: float "Value Tolerance for the color" +#Node|CompositorNode|CompositorNodeColorMatte.color_hue -> color_hue: float "Hue tolerance for colors to be considered a keying color" +#Node|CompositorNode|CompositorNodeColorMatte.color_saturation -> color_saturation: float "Saturation Tolerance for the color" +#Node|CompositorNode|CompositorNodeColorMatte.color_value -> color_value: float "Value Tolerance for the color" #+ * Node|CompositorNode|CompositorNodeColorSpill.channel -> channel: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeColorSpill.limit_channel -> limit_channel: enum "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeColorSpill.algorithm -> limit_method: enum "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeColorSpill.limit_method -> limit_method: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeColorSpill.ratio -> ratio: float "Scale limit by value" #+ * Node|CompositorNode|CompositorNodeColorSpill.unspill_blue -> unspill_blue: float "Blue spillmap scale" #+ * Node|CompositorNode|CompositorNodeColorSpill.unspill_green -> unspill_green: float "Green spillmap scale" #+ * Node|CompositorNode|CompositorNodeColorSpill.unspill_red -> unspill_red: float "Red spillmap scale" - + * Node|CompositorNode|CompositorNodeColorSpill.unspill -> use_unspill: boolean "Compensate all channels (diffenrently) by hand" - + * Node|CompositorNode|CompositorNodeCrop.x2 -> max_x: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeCrop.y2 -> max_y: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeCrop.x1 -> min_x: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeCrop.y1 -> min_y: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeCrop.crop_size -> use_crop_size: boolean "Whether to crop the size of the input image" +#Node|CompositorNode|CompositorNodeColorSpill.use_unspill -> use_unspill: boolean "Compensate all channels (diffenrently) by hand" +#Node|CompositorNode|CompositorNodeCrop.max_x -> max_x: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeCrop.max_y -> max_y: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeCrop.min_x -> min_x: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeCrop.min_y -> min_y: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeCrop.use_crop_size -> use_crop_size: boolean "Whether to crop the size of the input image" #+ * Node|CompositorNode|CompositorNodeCurveRGB.mapping -> mapping: pointer, "(read-only)" #+ * Node|CompositorNode|CompositorNodeCurveVec.mapping -> mapping: pointer, "(read-only)" #+ * Node|CompositorNode|CompositorNodeDBlur.angle -> angle: float "NO DESCRIPTION" @@ -2550,16 +2550,16 @@ #+ * Node|CompositorNode|CompositorNodeDBlur.distance -> distance: float "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeDBlur.iterations -> iterations: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeDBlur.spin -> spin: float "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeDBlur.wrap -> use_wrap: boolean "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeDBlur.use_wrap -> use_wrap: boolean "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeDBlur.zoom -> zoom: float "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeDefocus.angle -> angle: int "Bokeh shape rotation offset in degrees" - + * Node|CompositorNode|CompositorNodeDefocus.max_blur -> blur_max: float "blur limit, maximum CoC radius, 0=no limit" +#Node|CompositorNode|CompositorNodeDefocus.blur_max -> blur_max: float "blur limit, maximum CoC radius, 0=no limit" #+ * Node|CompositorNode|CompositorNodeDefocus.bokeh -> bokeh: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeDefocus.f_stop -> f_stop: float "Amount of focal blur, 128=infinity=perfect focus, half the value doubles the blur radius" #+ * Node|CompositorNode|CompositorNodeDefocus.samples -> samples: int "Number of samples (16=grainy, higher=less noise)" #+ * Node|CompositorNode|CompositorNodeDefocus.threshold -> threshold: float "CoC radius threshold, prevents background bleed on in-focus midground, 0=off" - + * Node|CompositorNode|CompositorNodeDefocus.gamma_correction -> use_gamma_correction: boolean "Enable gamma correction before and after main process" - + * Node|CompositorNode|CompositorNodeDefocus.preview -> use_preview: boolean "Enable sampling mode, useful for preview when using low samplecounts" +#Node|CompositorNode|CompositorNodeDefocus.use_gamma_correction -> use_gamma_correction: boolean "Enable gamma correction before and after main process" +#Node|CompositorNode|CompositorNodeDefocus.use_preview -> use_preview: boolean "Enable sampling mode, useful for preview when using low samplecounts" #+ * Node|CompositorNode|CompositorNodeDefocus.use_zbuffer -> use_zbuffer: boolean "Disable when using an image as input instead of actual zbuffer (auto enabled if node not image based, eg. time node)" #+ * Node|CompositorNode|CompositorNodeDefocus.z_scale -> z_scale: float "Scales the Z input when not using a zbuffer, controls maximum blur designated by the color white or input value 1" #+ * Node|CompositorNode|CompositorNodeDiffMatte.falloff -> falloff: float "Color distances below this additional threshold are partially keyed" @@ -2579,27 +2579,27 @@ #+ * Node|CompositorNode|CompositorNodeGlare.size -> size: int "Glow/glare size (not actual size; relative to initial size of bright area of pixels)" #+ * Node|CompositorNode|CompositorNodeGlare.streaks -> streaks: int "Total number of streaks" #+ * Node|CompositorNode|CompositorNodeGlare.threshold -> threshold: float "The glare filter will only be applied to pixels brighter than this value" - + * Node|CompositorNode|CompositorNodeGlare.rotate_45 -> use_rotate_45: boolean "Simple star filter: add 45 degree rotation offset" +#Node|CompositorNode|CompositorNodeGlare.use_rotate_45 -> use_rotate_45: boolean "Simple star filter: add 45 degree rotation offset" #+ * Node|CompositorNode|CompositorNodeHueCorrect.mapping -> mapping: pointer, "(read-only)" - + * Node|CompositorNode|CompositorNodeHueSat.hue -> color_hue: float "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeHueSat.sat -> color_saturation: float "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeHueSat.val -> color_value: float "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeHueSat.color_hue -> color_hue: float "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeHueSat.color_saturation -> color_saturation: float "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeHueSat.color_value -> color_value: float "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeIDMask.index -> index: int "Pass index number to convert to alpha" - + * Node|CompositorNode|CompositorNodeImage.frames -> frame_duration: int "Number of images used in animation" - + * Node|CompositorNode|CompositorNodeImage.offset -> frame_offset: int "Offsets the number of the frame to use in the animation" - + * Node|CompositorNode|CompositorNodeImage.start -> frame_start: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeImage.frame_duration -> frame_duration: int "Number of images used in animation" +#Node|CompositorNode|CompositorNodeImage.frame_offset -> frame_offset: int "Offsets the number of the frame to use in the animation" +#Node|CompositorNode|CompositorNodeImage.frame_start -> frame_start: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeImage.image -> image: pointer "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeImage.layer -> layer: enum "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeImage.auto_refresh -> use_auto_refresh: boolean "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeImage.cyclic -> use_cyclic: boolean "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeInvert.alpha -> invert_alpha: boolean "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeInvert.rgb -> invert_rgb: boolean "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeLensdist.fit -> use_fit: boolean "For positive distortion factor only: scale image such that black areas are not visible" - + * Node|CompositorNode|CompositorNodeLensdist.jitter -> use_jitter: boolean "Enable/disable jittering; faster, but also noisier" - + * Node|CompositorNode|CompositorNodeLensdist.projector -> use_projector: boolean "Enable/disable projector mode. Effect is applied in horizontal direction only" +#Node|CompositorNode|CompositorNodeImage.use_auto_refresh -> use_auto_refresh: boolean "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeImage.use_cyclic -> use_cyclic: boolean "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeInvert.invert_alpha -> invert_alpha: boolean "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeInvert.invert_rgb -> invert_rgb: boolean "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeLensdist.use_fit -> use_fit: boolean "For positive distortion factor only: scale image such that black areas are not visible" +#Node|CompositorNode|CompositorNodeLensdist.use_jitter -> use_jitter: boolean "Enable/disable jittering; faster, but also noisier" +#Node|CompositorNode|CompositorNodeLensdist.use_projector -> use_projector: boolean "Enable/disable projector mode. Effect is applied in horizontal direction only" #+ * Node|CompositorNode|CompositorNodeLevels.channel -> channel: enum "NO DESCRIPTION" -#+ * Node|CompositorNode|CompositorNodeLumaMatte.high -> high: float "Values higher than this setting are 100% opaque" -#+ * Node|CompositorNode|CompositorNodeLumaMatte.low -> low: float "Values lower than this setting are 100% keyed" +#Node|CompositorNode|CompositorNodeLumaMatte.limit_max -> limit_max: float "Values higher than this setting are 100% opaque" +#Node|CompositorNode|CompositorNodeLumaMatte.limit_min -> limit_min: float "Values lower than this setting are 100% keyed" #+ * Node|CompositorNode|CompositorNodeMapUV.alpha -> alpha: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeMapValue.max -> max: float[1] "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeMapValue.min -> min: float[1] "NO DESCRIPTION" @@ -2609,26 +2609,26 @@ #+ * Node|CompositorNode|CompositorNodeMapValue.use_min -> use_min: boolean "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeMath.operation -> operation: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeMixRGB.blend_type -> blend_type: enum "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeMixRGB.alpha -> use_alpha: boolean "Include alpha of second input in this operation" +#Node|CompositorNode|CompositorNodeMixRGB.use_alpha -> use_alpha: boolean "Include alpha of second input in this operation" #+ * Node|CompositorNode|CompositorNodeOutputFile.exr_codec -> exr_codec: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeOutputFile.filepath -> filepath: string "Output path for the image, same functionality as render output." #+ * Node|CompositorNode|CompositorNodeOutputFile.frame_end -> frame_end: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeOutputFile.frame_start -> frame_start: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeOutputFile.image_type -> image_type: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeOutputFile.quality -> quality: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeOutputFile.exr_half -> use_exr_half: boolean "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeOutputFile.use_exr_half -> use_exr_half: boolean "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodePremulKey.mapping -> mapping: enum "Conversion between premultiplied alpha and key alpha" #+ * Node|CompositorNode|CompositorNodeRLayers.layer -> layer: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeRLayers.scene -> scene: pointer "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeRotate.filter -> filter_type: enum "Method to use to filter rotation" +#Node|CompositorNode|CompositorNodeRotate.filter_type -> filter_type: enum "Method to use to filter rotation" #+ * Node|CompositorNode|CompositorNodeScale.space -> space: enum "Coordinate space to scale relative to" #+ * Node|CompositorNode|CompositorNodeSplitViewer.axis -> axis: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeSplitViewer.factor -> factor: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeTexture.node_output -> node_output: int "For node-based textures, which output node to use" #+ * Node|CompositorNode|CompositorNodeTexture.texture -> texture: pointer "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeTime.curve -> curve: pointer, "(read-only)" - + * Node|CompositorNode|CompositorNodeTime.end -> frame_end: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeTime.start -> frame_start: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeTime.frame_end -> frame_end: int "NO DESCRIPTION" +#Node|CompositorNode|CompositorNodeTime.frame_start -> frame_start: int "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeTonemap.adaptation -> adaptation: float "If 0, global; if 1, based on pixel intensity" #+ * Node|CompositorNode|CompositorNodeTonemap.contrast -> contrast: float "Set to 0 to use estimate from input image" #+ * Node|CompositorNode|CompositorNodeTonemap.correction -> correction: float "If 0, same for all channels; if 1, each independent" @@ -2636,35 +2636,35 @@ #+ * Node|CompositorNode|CompositorNodeTonemap.intensity -> intensity: float "If less than zero, darkens image; otherwise, makes it brighter" #+ * Node|CompositorNode|CompositorNodeTonemap.key -> key: float "The value the average luminance is mapped to" #+ * Node|CompositorNode|CompositorNodeTonemap.offset -> offset: float "Normally always 1, but can be used as an extra control to alter the brightness curve" - + * Node|CompositorNode|CompositorNodeTonemap.tonemap_type -> type: enum "NO DESCRIPTION" +#+ * Node|CompositorNode|CompositorNodeTonemap.tonemap_type -> tonemap_type: enum "NO DESCRIPTION" #+ * Node|CompositorNode|CompositorNodeValToRGB.color_ramp -> color_ramp: pointer, "(read-only)" #+ * Node|CompositorNode|CompositorNodeVecBlur.factor -> factor: float "Scaling factor for motion vectors; actually shutter speed in frames" #+ * Node|CompositorNode|CompositorNodeVecBlur.samples -> samples: int "NO DESCRIPTION" - + * Node|CompositorNode|CompositorNodeVecBlur.max_speed -> speed_max: int "Maximum speed, or zero for none" - + * Node|CompositorNode|CompositorNodeVecBlur.min_speed -> speed_min: int "Minimum speed for a pixel to be blurred; used to separate background from foreground" - + * Node|CompositorNode|CompositorNodeVecBlur.curved -> use_curved: boolean "Interpolate between frames in a bezier curve, rather than linearly" +#Node|CompositorNode|CompositorNodeVecBlur.speed_max -> speed_max: int "Maximum speed, or zero for none" +#Node|CompositorNode|CompositorNodeVecBlur.speed_min -> speed_min: int "Minimum speed for a pixel to be blurred; used to separate background from foreground" +#Node|CompositorNode|CompositorNodeVecBlur.use_curved -> use_curved: boolean "Interpolate between frames in a bezier curve, rather than linearly" #+ * Node|NodeGroup.nodetree -> nodetree: pointer "NO DESCRIPTION" #+ * Node|ShaderNode.type -> type: enum, "(read-only)" #+ * Node|ShaderNode|ShaderNodeExtendedMaterial.invert_normal -> invert_normal: boolean "Material Node uses inverted normal" #+ * Node|ShaderNode|ShaderNodeExtendedMaterial.material -> material: pointer "NO DESCRIPTION" - + * Node|ShaderNode|ShaderNodeExtendedMaterial.diffuse -> use_diffuse: boolean "Material Node outputs Diffuse" - + * Node|ShaderNode|ShaderNodeExtendedMaterial.specular -> use_specular: boolean "Material Node outputs Specular" +#Node|ShaderNode|ShaderNodeExtendedMaterial.use_diffuse -> use_diffuse: boolean "Material Node outputs Diffuse" +#Node|ShaderNode|ShaderNodeExtendedMaterial.use_specular -> use_specular: boolean "Material Node outputs Specular" #+ * Node|ShaderNode|ShaderNodeGeometry.color_layer -> color_layer: string "NO DESCRIPTION" #+ * Node|ShaderNode|ShaderNodeGeometry.uv_layer -> uv_layer: string "NO DESCRIPTION" #+ * Node|ShaderNode|ShaderNodeMapping.location -> location: float[3] "Location offset for the input coordinate" - + * Node|ShaderNode|ShaderNodeMapping.maximum -> max: float[3] "Maximum value to clamp coordinate to" - + * Node|ShaderNode|ShaderNodeMapping.minimum -> min: float[3] "Minimum value to clamp coordinate to" +#Node|ShaderNode|ShaderNodeMapping.max -> max: float[3] "Maximum value to clamp coordinate to" +#Node|ShaderNode|ShaderNodeMapping.min -> min: float[3] "Minimum value to clamp coordinate to" #+ * Node|ShaderNode|ShaderNodeMapping.rotation -> rotation: float[3] "Rotation offset for the input coordinate" #+ * Node|ShaderNode|ShaderNodeMapping.scale -> scale: float[3] "Scale adjustment for the input coordinate" - + * Node|ShaderNode|ShaderNodeMapping.clamp_maximum -> use_max: boolean "Clamp the output coordinate to a maximum value" - + * Node|ShaderNode|ShaderNodeMapping.clamp_minimum -> use_min: boolean "Clamp the output coordinate to a minimum value" +#Node|ShaderNode|ShaderNodeMapping.use_max -> use_max: boolean "Clamp the output coordinate to a maximum value" +#Node|ShaderNode|ShaderNodeMapping.use_min -> use_min: boolean "Clamp the output coordinate to a minimum value" #+ * Node|ShaderNode|ShaderNodeMaterial.invert_normal -> invert_normal: boolean "Material Node uses inverted normal" #+ * Node|ShaderNode|ShaderNodeMaterial.material -> material: pointer "NO DESCRIPTION" - + * Node|ShaderNode|ShaderNodeMaterial.diffuse -> use_diffuse: boolean "Material Node outputs Diffuse" - + * Node|ShaderNode|ShaderNodeMaterial.specular -> use_specular: boolean "Material Node outputs Specular" +#Node|ShaderNode|ShaderNodeMaterial.use_diffuse -> use_diffuse: boolean "Material Node outputs Diffuse" +#Node|ShaderNode|ShaderNodeMaterial.use_specular -> use_specular: boolean "Material Node outputs Specular" #+ * Node|ShaderNode|ShaderNodeMath.operation -> operation: enum "NO DESCRIPTION" #+ * Node|ShaderNode|ShaderNodeMixRGB.blend_type -> blend_type: enum "NO DESCRIPTION" - + * Node|ShaderNode|ShaderNodeMixRGB.alpha -> use_alpha: boolean "Include alpha of second input in this operation" +#Node|ShaderNode|ShaderNodeMixRGB.use_alpha -> use_alpha: boolean "Include alpha of second input in this operation" #+ * Node|ShaderNode|ShaderNodeRGBCurve.mapping -> mapping: pointer, "(read-only)" #+ * Node|ShaderNode|ShaderNodeTexture.node_output -> node_output: int "For node-based textures, which output node to use" #+ * Node|ShaderNode|ShaderNodeTexture.texture -> texture: pointer "NO DESCRIPTION" @@ -2678,13 +2678,13 @@ #+ * Node|TextureNode|TextureNodeBricks.squash_frequency -> squash_frequency: int "Squash every N rows" #+ * Node|TextureNode|TextureNodeCurveRGB.mapping -> mapping: pointer, "(read-only)" #+ * Node|TextureNode|TextureNodeCurveTime.curve -> curve: pointer, "(read-only)" - + * Node|TextureNode|TextureNodeCurveTime.end -> frame_end: int "NO DESCRIPTION" - + * Node|TextureNode|TextureNodeCurveTime.start -> frame_start: int "NO DESCRIPTION" +#Node|TextureNode|TextureNodeCurveTime.frame_end -> frame_end: int "NO DESCRIPTION" +#Node|TextureNode|TextureNodeCurveTime.frame_start -> frame_start: int "NO DESCRIPTION" #+ * Node|TextureNode|TextureNodeImage.image -> image: pointer "NO DESCRIPTION" #+ * Node|TextureNode|TextureNodeMath.operation -> operation: enum "NO DESCRIPTION" #+ * Node|TextureNode|TextureNodeMixRGB.blend_type -> blend_type: enum "NO DESCRIPTION" - + * Node|TextureNode|TextureNodeMixRGB.alpha -> use_alpha: boolean "Include alpha of second input in this operation" - + * Node|TextureNode|TextureNodeOutput.output_name -> filepath: string "NO DESCRIPTION" +#Node|TextureNode|TextureNodeMixRGB.use_alpha -> use_alpha: boolean "Include alpha of second input in this operation" +#Node|TextureNode|TextureNodeOutput.filepath -> filepath: string "NO DESCRIPTION" #+ * Node|TextureNode|TextureNodeTexture.node_output -> node_output: int "For node-based textures, which output node to use" #+ * Node|TextureNode|TextureNodeTexture.texture -> texture: pointer "NO DESCRIPTION" #+ * Node|TextureNode|TextureNodeValToRGB.color_ramp -> color_ramp: pointer, "(read-only)" @@ -2712,7 +2712,7 @@ #+ * Paint|ImagePaint.seam_bleed -> seam_bleed: int "Extend paint beyond the faces UVs to reduce seams (in pixels, slower)" #+ * Paint|ImagePaint.show_brush -> show_brush: boolean "Enables brush shape while not drawing" #+ * Paint|ImagePaint.show_brush_draw -> show_brush_draw: boolean "Enables brush shape while drawing" - + * Paint|ImagePaint.use_backface_cull -> use_backface_culling: boolean "Ignore faces pointing away from the view (faster)" +#Paint|ImagePaint.use_backface_culling -> use_backface_culling: boolean "Ignore faces pointing away from the view (faster)" #+ * Paint|ImagePaint.use_clone_layer -> use_clone_layer: boolean "Use another UV layer as clone source, otherwise use 3D the cursor as the source" #+ * Paint|ImagePaint.use_normal_falloff -> use_normal_falloff: boolean "Paint most on faces pointing towards the view" #+ * Paint|ImagePaint.use_occlude -> use_occlude: boolean "Only paint onto the faces directly under the brush (slower)" @@ -2721,15 +2721,15 @@ #+ * Paint|Sculpt.lock_x -> lock_x: boolean "Disallow changes to the X axis of vertices" #+ * Paint|Sculpt.lock_y -> lock_y: boolean "Disallow changes to the Y axis of vertices" #+ * Paint|Sculpt.lock_z -> lock_z: boolean "Disallow changes to the Z axis of vertices" - + * Paint|Sculpt.radial_symm -> radial_symmetry: int[3] "Number of times to copy strokes across the surface" - + * Paint|Sculpt.use_openmp -> use_multithread: boolean "Take advantage of multiple CPU cores to improve sculpting performance" +#Paint|Sculpt.radial_symmetry -> radial_symmetry: int[3] "Number of times to copy strokes across the surface" #+ * Paint|Sculpt.use_symmetry_feather -> use_symmetry_feather: boolean "Reduce the strength of the brush where it overlaps symmetrical daubs" - + * Paint|Sculpt.symmetry_x -> use_symmetry_x: boolean "Mirror brush across the X axis" - + * Paint|Sculpt.symmetry_y -> use_symmetry_y: boolean "Mirror brush across the Y axis" - + * Paint|Sculpt.symmetry_z -> use_symmetry_z: boolean "Mirror brush across the Z axis" - + * Paint|VertexPaint.all_faces -> use_all_faces: boolean "Paint on all faces inside brush" - + * Paint|VertexPaint.normals -> use_normal: boolean "Applies the vertex normal before painting" - + * Paint|VertexPaint.spray -> use_spray: boolean "Keep applying paint effect while holding mouse" +#Paint|Sculpt.use_symmetry_x -> use_symmetry_x: boolean "Mirror brush across the X axis" +#Paint|Sculpt.use_symmetry_y -> use_symmetry_y: boolean "Mirror brush across the Y axis" +#Paint|Sculpt.use_symmetry_z -> use_symmetry_z: boolean "Mirror brush across the Z axis" +#Paint|Sculpt.use_threaded -> use_threaded: boolean "Take advantage of multiple CPU cores to improve sculpting performance" +#Paint|VertexPaint.use_all_faces -> use_all_faces: boolean "Paint on all faces inside brush" +#Paint|VertexPaint.use_normal -> use_normal: boolean "Applies the vertex normal before painting" +#Paint|VertexPaint.use_spray -> use_spray: boolean "Keep applying paint effect while holding mouse" #+ * Panel.bl_context -> bl_context: string "The context in which the panel belongs to. (TODO: explain the possible combinations bl_context/bl_region_type/bl_space_type)" #+ * Panel.bl_idname -> bl_idname: string "If this is set, the panel gets a custom ID, otherwise it takes the name of the class used to define the panel. For example, if the class name is OBJECT_PT_hello, and bl_idname is not set by the script, then bl_idname = OBJECT_PT_hello" #+ * Panel.bl_label -> bl_label: string "The panel label, shows up in the panel header at the right of the triangle used to collapse the panel." @@ -2741,13 +2741,13 @@ #TODO SHOULD THIS BE HERE * Panel.text -> text: string "XXX todo" #+ * Particle.alive_state -> alive_state: enum "NO DESCRIPTION" #+ * Particle.angular_velocity -> angular_velocity: float[3] "NO DESCRIPTION" - + * Particle.birthtime -> birth_time: float "NO DESCRIPTION" +#Particle.birth_time -> birth_time: float "NO DESCRIPTION" #+ * Particle.die_time -> die_time: float "NO DESCRIPTION" - + * Particle.is_existing -> is_exist: boolean, "(read-only)" +#Particle.is_exist -> is_exist: boolean, "(read-only)" #Particle.is_hair -> is_hair: collection, "(read-only)" #+ * Particle.is_visible -> is_visible: boolean, "(read-only)" #+ * Particle.keys -> keys: collection, "(read-only)" - + * Particle.lifetime -> life_time: float "NO DESCRIPTION" +#+ * Particle.lifetime -> lifetime: float "NO DESCRIPTION" #+ * Particle.location -> location: float[3] "NO DESCRIPTION" #+ * Particle.prev_angular_velocity -> prev_angular_velocity: float[3] "NO DESCRIPTION" #+ * Particle.prev_location -> prev_location: float[3] "NO DESCRIPTION" @@ -2767,23 +2767,23 @@ #+ * ParticleDupliWeight.count -> count: int "The number of times this object is repeated with respect to other objects" #+ * ParticleDupliWeight.name -> name: string, "(read-only) Particle dupliobject name" #+ * ParticleEdit.brush -> brush: pointer, "(read-only)" - + * ParticleEdit.add_keys -> default_key_count: int "How many keys to make new particles with" +#ParticleEdit.default_key_count -> default_key_count: int "How many keys to make new particles with" #+ * ParticleEdit.draw_step -> draw_step: int "How many steps to draw the path with" #+ * ParticleEdit.emitter_distance -> emitter_distance: float "Distance to keep particles away from the emitter" #+ * ParticleEdit.fade_frames -> fade_frames: int "How many frames to fade" #ParticleEdit.is_editable -> is_editable: boolean, "(read-only) A valid edit mode exists" #ParticleEdit.is_hair -> is_hair: boolean, "(read-only) Editing hair" #+ * ParticleEdit.object -> object: pointer, "(read-only) The edited object" - + * ParticleEdit.selection_mode -> select_mode: enum "Particle select and display mode" +#ParticleEdit.select_mode -> select_mode: enum "Particle select and display mode" #ParticleEdit.show_particles -> show_particles: boolean "Draw actual particles" #+ * ParticleEdit.tool -> tool: enum "NO DESCRIPTION" #+ * ParticleEdit.type -> type: enum "NO DESCRIPTION" - + * ParticleEdit.auto_velocity -> use_auto_velocity: boolean "Calculate point velocities automatically" - + * ParticleEdit.add_interpolate -> use_default_interpolate: boolean "Interpolate new particles from the existing ones" - + * ParticleEdit.emitter_deflect -> use_emitter_deflect: boolean "Keep paths from intersecting the emitter" - + * ParticleEdit.fade_time -> use_fade_time: boolean "Fade paths and keys further away from current frame" - + * ParticleEdit.keep_lengths -> use_preserve_length: boolean "Keep path lengths constant" - + * ParticleEdit.keep_root -> use_preserve_root: boolean "Keep root keys unmodified" +#ParticleEdit.use_auto_velocity -> use_auto_velocity: boolean "Calculate point velocities automatically" +#ParticleEdit.use_default_interpolate -> use_default_interpolate: boolean "Interpolate new particles from the existing ones" +#ParticleEdit.use_emitter_deflect -> use_emitter_deflect: boolean "Keep paths from intersecting the emitter" +#ParticleEdit.use_fade_time -> use_fade_time: boolean "Fade paths and keys further away from current frame" +#ParticleEdit.use_preserve_length -> use_preserve_length: boolean "Keep path lengths constant" +#ParticleEdit.use_preserve_root -> use_preserve_root: boolean "Keep root keys unmodified" #ParticleHairKey.co -> co: float[3] "Location of the hair key in object space" #ParticleHairKey.co_hair_space -> co_hair_space: float[3] "Location of the hair key in its internal coordinate system, relative to the emitting face" #+ * ParticleHairKey.time -> time: float "Relative time of key over hair length" @@ -2801,18 +2801,18 @@ #+ * ParticleSystem.child_particles -> child_particles: collection, "(read-only) Child particles generated by the particle system" #+ * ParticleSystem.cloth -> cloth: pointer, "(read-only) Cloth dynamics for hair" #ParticleSystem.has_multiple_caches -> has_multiple_caches: boolean, "(read-only) Particle system has multiple point caches" - + * ParticleSystem.vertex_group_clump_negate -> invert_vertex_group_clump: boolean "Negate the effect of the clump vertex group" - + * ParticleSystem.vertex_group_density_negate -> invert_vertex_group_density: boolean "Negate the effect of the density vertex group" - + * ParticleSystem.vertex_group_field_negate -> invert_vertex_group_field: boolean "Negate the effect of the field vertex group" - + * ParticleSystem.vertex_group_kink_negate -> invert_vertex_group_kink: boolean "Negate the effect of the kink vertex group" - + * ParticleSystem.vertex_group_length_negate -> invert_vertex_group_length: boolean "Negate the effect of the length vertex group" - + * ParticleSystem.vertex_group_rotation_negate -> invert_vertex_group_rotation: boolean "Negate the effect of the rotation vertex group" - + * ParticleSystem.vertex_group_roughness1_negate -> invert_vertex_group_roughness_1: boolean "Negate the effect of the roughness 1 vertex group" - + * ParticleSystem.vertex_group_roughness2_negate -> invert_vertex_group_roughness_2: boolean "Negate the effect of the roughness 2 vertex group" - + * ParticleSystem.vertex_group_roughness_end_negate -> invert_vertex_group_roughness_end: boolean "Negate the effect of the roughness end vertex group" - + * ParticleSystem.vertex_group_size_negate -> invert_vertex_group_size: boolean "Negate the effect of the size vertex group" - + * ParticleSystem.vertex_group_tangent_negate -> invert_vertex_group_tangent: boolean "Negate the effect of the tangent vertex group" - + * ParticleSystem.vertex_group_velocity_negate -> invert_vertex_group_velocity: boolean "Negate the effect of the velocity vertex group" +#ParticleSystem.invert_vertex_group_clump -> invert_vertex_group_clump: boolean "Negate the effect of the clump vertex group" +#ParticleSystem.invert_vertex_group_density -> invert_vertex_group_density: boolean "Negate the effect of the density vertex group" +#ParticleSystem.invert_vertex_group_field -> invert_vertex_group_field: boolean "Negate the effect of the field vertex group" +#ParticleSystem.invert_vertex_group_kink -> invert_vertex_group_kink: boolean "Negate the effect of the kink vertex group" +#ParticleSystem.invert_vertex_group_length -> invert_vertex_group_length: boolean "Negate the effect of the length vertex group" +#ParticleSystem.invert_vertex_group_rotation -> invert_vertex_group_rotation: boolean "Negate the effect of the rotation vertex group" +#ParticleSystem.invert_vertex_group_roughness_1 -> invert_vertex_group_roughness_1: boolean "Negate the effect of the roughness 1 vertex group" +#ParticleSystem.invert_vertex_group_roughness_2 -> invert_vertex_group_roughness_2: boolean "Negate the effect of the roughness 2 vertex group" +#ParticleSystem.invert_vertex_group_roughness_end -> invert_vertex_group_roughness_end: boolean "Negate the effect of the roughness end vertex group" +#ParticleSystem.invert_vertex_group_size -> invert_vertex_group_size: boolean "Negate the effect of the size vertex group" +#ParticleSystem.invert_vertex_group_tangent -> invert_vertex_group_tangent: boolean "Negate the effect of the tangent vertex group" +#ParticleSystem.invert_vertex_group_velocity -> invert_vertex_group_velocity: boolean "Negate the effect of the velocity vertex group" #ParticleSystem.is_editable -> is_editable: boolean, "(read-only) Particle system can be edited in particle mode" #ParticleSystem.is_edited -> is_edited: boolean, "(read-only) Particle system has been edited in particle mode" #ParticleSystem.is_global_hair -> is_global_hair: boolean, "(read-only) Hair keys are in global coordinate space" @@ -2825,23 +2825,23 @@ #+ * ParticleSystem.seed -> seed: int "Offset in the random number table, to get a different randomized result" #+ * ParticleSystem.settings -> settings: pointer "Particle system settings" #+ * ParticleSystem.targets -> targets: collection, "(read-only) Target particle systems" - + * ParticleSystem.hair_dynamics -> use_hair_dynamics: boolean "Enable hair dynamics using cloth simulation" - + * ParticleSystem.keyed_timing -> use_keyed_timing: boolean "Use key times" +#ParticleSystem.use_hair_dynamics -> use_hair_dynamics: boolean "Enable hair dynamics using cloth simulation" +#ParticleSystem.use_keyed_timing -> use_keyed_timing: boolean "Use key times" #+ * ParticleSystem.vertex_group_clump -> vertex_group_clump: string "Vertex group to control clump" #+ * ParticleSystem.vertex_group_density -> vertex_group_density: string "Vertex group to control density" #+ * ParticleSystem.vertex_group_field -> vertex_group_field: string "Vertex group to control field" #+ * ParticleSystem.vertex_group_kink -> vertex_group_kink: string "Vertex group to control kink" #+ * ParticleSystem.vertex_group_length -> vertex_group_length: string "Vertex group to control length" #+ * ParticleSystem.vertex_group_rotation -> vertex_group_rotation: string "Vertex group to control rotation" - + * ParticleSystem.vertex_group_roughness1 -> vertex_group_roughness_1: string "Vertex group to control roughness 1" - + * ParticleSystem.vertex_group_roughness2 -> vertex_group_roughness_2: string "Vertex group to control roughness 2" +#ParticleSystem.vertex_group_roughness_1 -> vertex_group_roughness_1: string "Vertex group to control roughness 1" +#ParticleSystem.vertex_group_roughness_2 -> vertex_group_roughness_2: string "Vertex group to control roughness 2" #+ * ParticleSystem.vertex_group_roughness_end -> vertex_group_roughness_end: string "Vertex group to control roughness end" #+ * ParticleSystem.vertex_group_size -> vertex_group_size: string "Vertex group to control size" #+ * ParticleSystem.vertex_group_tangent -> vertex_group_tangent: string "Vertex group to control tangent" #+ * ParticleSystem.vertex_group_velocity -> vertex_group_velocity: string "Vertex group to control velocity" - + * ParticleTarget.mode -> alliance: enum "NO DESCRIPTION" +#ParticleTarget.alliance -> alliance: enum "NO DESCRIPTION" #+ * ParticleTarget.duration -> duration: float "NO DESCRIPTION" - + * ParticleTarget.valid -> is_valid: boolean "Keyed particles target is valid" +#ParticleTarget.is_valid -> is_valid: boolean "Keyed particles target is valid" #+ * ParticleTarget.name -> name: string, "(read-only) Particle target name" #+ * ParticleTarget.object -> object: pointer "The object that has the target particle system (empty if same object)" #+ * ParticleTarget.system -> system: int "The index of particle system on the target object" @@ -2850,7 +2850,7 @@ #+ * PointCache.filepath -> filepath: string "Cache file path" #+ * PointCache.frame_end -> frame_end: int "Frame on which the simulation stops" #+ * PointCache.frame_start -> frame_start: int "Frame on which the simulation starts" - + * PointCache.step -> frame_step: int "Number of frames between cached frames" +#PointCache.frame_step -> frame_step: int "Number of frames between cached frames" #+ * PointCache.frames_skipped -> frames_skipped: boolean, "(read-only)" #+ * PointCache.index -> index: int "Index number of cache files" #+ * PointCache.info -> info: string, "(read-only) Info on current cache status" @@ -2859,27 +2859,27 @@ #PointCache.is_outdated -> is_outdated: boolean, "(read-only)" #+ * PointCache.name -> name: string "Cache name" #PointCache.point_caches -> point_caches: collection, "(read-only) Point cache list" - + * PointCache.disk_cache -> use_disk_cache: boolean "Save cache files to disk (.blend file must be saved first)" - + * PointCache.external -> use_external: boolean "Read cache from an external location" +#PointCache.use_disk_cache -> use_disk_cache: boolean "Save cache files to disk (.blend file must be saved first)" +#PointCache.use_external -> use_external: boolean "Read cache from an external location" #+ * PointCache.use_library_path -> use_library_path: boolean "Use this files path when library linked into another file." - + * PointCache.quick_cache -> use_quick_cache: boolean "Update simulation with cache steps" +#PointCache.use_quick_cache -> use_quick_cache: boolean "Update simulation with cache steps" #+ * PointDensity.color_ramp -> color_ramp: pointer, "(read-only)" #+ * PointDensity.color_source -> color_source: enum "Data to derive color results from" #+ * PointDensity.falloff -> falloff: enum "Method of attenuating density by distance from the point" - + * PointDensity.falloff_softness -> falloff_soft: float "Softness of the soft falloff option" +#PointDensity.falloff_soft -> falloff_soft: float "Softness of the soft falloff option" #+ * PointDensity.noise_basis -> noise_basis: enum "Noise formula used for turbulence" #+ * PointDensity.object -> object: pointer "Object to take point data from" - + * PointDensity.particle_cache -> particle_cache_space: enum "Co-ordinate system to cache particles in" +#PointDensity.particle_cache_space -> particle_cache_space: enum "Co-ordinate system to cache particles in" #+ * PointDensity.particle_system -> particle_system: pointer "Particle System to render as points" #+ * PointDensity.point_source -> point_source: enum "Point data to use as renderable point density" #+ * PointDensity.radius -> radius: float "Radius from the shaded sample to look for points within" #+ * PointDensity.speed_scale -> speed_scale: float "Multiplier to bring particle speed within an acceptable range" #+ * PointDensity.turbulence_depth -> turbulence_depth: int "Level of detail in the added turbulent noise" #+ * PointDensity.turbulence_influence -> turbulence_influence: enum "Method for driving added turbulent noise" - + * PointDensity.turbulence_size -> turbulence_scale: float "Scale of the added turbulent noise" +#PointDensity.turbulence_scale -> turbulence_scale: float "Scale of the added turbulent noise" #+ * PointDensity.turbulence_strength -> turbulence_strength: float "NO DESCRIPTION" - + * PointDensity.turbulence -> use_turbulence: boolean "Add directed noise to the density at render-time" - + * PointDensity.vertices_cache -> vertex_cache_space: enum "Co-ordinate system to cache vertices in" +#PointDensity.use_turbulence -> use_turbulence: boolean "Add directed noise to the density at render-time" +#PointDensity.vertex_cache_space -> vertex_cache_space: enum "Co-ordinate system to cache vertices in" #+ * Pose.active_bone_group -> active_bone_group: pointer "Active bone group for this pose" #+ * Pose.active_bone_group_index -> active_bone_group_index: int "Active index in bone groups array" #+ * Pose.animation_visualisation -> animation_visualisation: pointer, "(read-only) Animation data for this datablock" @@ -2895,26 +2895,23 @@ #+ * PoseBone.custom_shape -> custom_shape: pointer "Object that defines custom draw type for this bone" #+ * PoseBone.custom_shape_transform -> custom_shape_transform: pointer "Bone that defines the display transform of this custom shape" #+ * PoseBone.head -> head: float[3], "(read-only) Location of head of the channels bone" - + * PoseBone.ik_lin_weight -> ik_linear_weight: float "Weight of scale constraint for IK" +#PoseBone.ik_linear_weight -> ik_linear_weight: float "Weight of scale constraint for IK" #+ * PoseBone.ik_max_x -> ik_max_x: float "Maximum angles for IK Limit" #+ * PoseBone.ik_max_y -> ik_max_y: float "Maximum angles for IK Limit" #+ * PoseBone.ik_max_z -> ik_max_z: float "Maximum angles for IK Limit" #+ * PoseBone.ik_min_x -> ik_min_x: float "Minimum angles for IK Limit" #+ * PoseBone.ik_min_y -> ik_min_y: float "Minimum angles for IK Limit" #+ * PoseBone.ik_min_z -> ik_min_z: float "Minimum angles for IK Limit" - + * PoseBone.ik_rot_weight -> ik_rotation_weight: float "Weight of rotation constraint for IK" +#PoseBone.ik_rotation_weight -> ik_rotation_weight: float "Weight of rotation constraint for IK" #+ * PoseBone.ik_stiffness_x -> ik_stiffness_x: float "IK stiffness around the X axis" #+ * PoseBone.ik_stiffness_y -> ik_stiffness_y: float "IK stiffness around the Y axis" #+ * PoseBone.ik_stiffness_z -> ik_stiffness_z: float "IK stiffness around the Z axis" #+ * PoseBone.ik_stretch -> ik_stretch: float "Allow scaling of the bone for IK" #PoseBone.is_in_ik_chain -> is_in_ik_chain: boolean, "(read-only) Is part of an IK chain" #+ * PoseBone.location -> location: float[3] "NO DESCRIPTION" - +NEGATE * PoseBone.ik_dof_x -> lock_ik_x: boolean "Allow movement around the X axis" - + * PoseBone.ik_limit_x -> lock_ik_x: boolean "Limit movement around the X axis" - +NEGATE * PoseBone.ik_dof_y -> lock_ik_y: boolean "Allow movement around the Y axis" - + * PoseBone.ik_limit_y -> lock_ik_y: boolean "Limit movement around the Y axis" - +NEGATE * PoseBone.ik_dof_z -> lock_ik_z: boolean "Allow movement around the Z axis" - + * PoseBone.ik_limit_z -> lock_ik_z: boolean "Limit movement around the Z axis" +#PoseBone.lock_ik_x -> lock_ik_x: boolean "Disallow movement around the X axis" +#PoseBone.lock_ik_y -> lock_ik_y: boolean "Disallow movement around the Y axis" +#PoseBone.lock_ik_z -> lock_ik_z: boolean "Disallow movement around the Z axis" #+ * PoseBone.lock_location -> lock_location: boolean[3] "Lock editing of location in the interface" #+ * PoseBone.lock_rotation -> lock_rotation: boolean[3] "Lock editing of rotation in the interface" #+ * PoseBone.lock_rotation_w -> lock_rotation_w: boolean "Lock editing of angle component of four-component rotations in the interface" @@ -2933,8 +2930,11 @@ #+ * PoseBone.scale -> scale: float[3] "NO DESCRIPTION" #+ * PoseBone.select -> select: boolean "NO DESCRIPTION" #+ * PoseBone.tail -> tail: float[3], "(read-only) Location of tail of the channels bone" - + * PoseBone.ik_lin_control -> use_ik_linear_control: boolean "Apply channel size as IK constraint if stretching is enabled" - + * PoseBone.ik_rot_control -> use_ik_rotation_control: boolean "Apply channel rotation as IK constraint" +#PoseBone.use_ik_limit_x -> use_ik_limit_x: boolean "Limit movement around the X axis" +#PoseBone.use_ik_limit_y -> use_ik_limit_y: boolean "Limit movement around the Y axis" +#PoseBone.use_ik_limit_z -> use_ik_limit_z: boolean "Limit movement around the Z axis" +#PoseBone.use_ik_linear_control -> use_ik_linear_control: boolean "Apply channel size as IK constraint if stretching is enabled" +#PoseBone.use_ik_rotation_control -> use_ik_rotation_control: boolean "Apply channel rotation as IK constraint" #+ * PoseBoneConstraints.active -> active: pointer "Active PoseChannel constraint" #+ * Property.description -> description: string, "(read-only) Description of the property for tooltips" #+ * Property.identifier -> identifier: string, "(read-only) Unique name used in the code and scripting" @@ -2984,7 +2984,7 @@ #+ * RegionView3D.lock_rotation -> lock_rotation: boolean "Lock view rotation in side views" #+ * RegionView3D.perspective_matrix -> perspective_matrix: float[16], "(read-only) Current perspective matrix of the 3D region" #RegionView3D.show_sync_view -> show_sync_view: boolean "Sync view position between side views" - + * RegionView3D.box_clip -> use_box_clip: boolean "Clip objects based on whats visible in other side views" +#RegionView3D.use_box_clip -> use_box_clip: boolean "Clip objects based on whats visible in other side views" #+ * RegionView3D.view_distance -> view_distance: float "Distance to the view location" #+ * RegionView3D.view_location -> view_location: float[3] "View pivot location" #+ * RegionView3D.view_matrix -> view_matrix: float[16], "(read-only) Current view matrix of the 3D region" @@ -3067,6 +3067,9 @@ #+ * RenderSettings.edge_color -> edge_color: float[3] "NO DESCRIPTION" #+ * RenderSettings.edge_threshold -> edge_threshold: int "Threshold for drawing outlines on geometry edges" #+ * RenderSettings.engine -> engine: enum "Engine to use for rendering" +#RenderSettings.exr_codec -> exr_codec: enum "Codec settings for OpenEXR" +#RenderSettings.exr_preview -> exr_preview: boolean "When rendering animations, save JPG preview images in same directory" +#RenderSettings.exr_zbuf -> exr_zbuf: boolean "Save the z-depth per pixel (32 bit unsigned int zbuffer)" #+ * RenderSettings.field_order -> field_order: enum "Order of video fields. Select which lines get rendered first, to create smooth motion for TV output" #+ * RenderSettings.file_extension -> file_extension: string, "(read-only) The file extension used for saving renders" #+ * RenderSettings.file_format -> file_format: enum "File format to save the rendered images as" @@ -3077,6 +3080,9 @@ #+ * RenderSettings.fps_base -> fps_base: float "Framerate base" #RenderSettings.has_multiple_engines -> has_multiple_engines: boolean, "(read-only) More than one rendering engine is available" #+ * RenderSettings.is_movie_format -> is_movie_format: boolean, "(read-only) When true the format is a movie" +#RenderSettings.jpeg2k_depth -> jpeg2k_depth: enum "Bit depth per channel" +#RenderSettings.jpeg2k_preset -> jpeg2k_preset: enum "Use a DCI Standard preset for saving jpeg2000" +#RenderSettings.jpeg2k_ycc -> jpeg2k_ycc: boolean "Save luminance-chrominance-chrominance channels instead of RGB colors" #+ * RenderSettings.layers -> layers: collection, "(read-only)" #+ * RenderSettings.motion_blur_samples -> motion_blur_samples: int "Number of scene samples to take with motion blur" #+ * RenderSettings.motion_blur_shutter -> motion_blur_shutter: float "Time taken in frames between shutter open and close" @@ -3115,6 +3121,7 @@ #RenderSettings.use_crop_to_border -> use_crop_to_border: boolean "Crop the rendered frame to the defined border size" #RenderSettings.use_edge_enhance -> use_edge_enhance: boolean "Create a toon outline around the edges of geometry" #+ * RenderSettings.use_envmaps -> use_envmaps: boolean "Calculate environment maps while rendering" +#RenderSettings.use_exr_half -> use_exr_half: boolean "Use 16 bit floats instead of 32 bit floats per channel" #RenderSettings.use_fields -> use_fields: boolean "Render image to two fields per frame, for interlaced TV output" #RenderSettings.use_fields_still -> use_fields_still: boolean "Disable the time difference between fields" #+ * RenderSettings.use_file_extension -> use_file_extension: boolean "Add the file format extensions to the rendered file name (eg: filename + .jpg)" @@ -3155,9 +3162,9 @@ #+ * SPHFluidSettings.fluid_radius -> fluid_radius: float "Fluid interaction Radius" #+ * SPHFluidSettings.rest_density -> rest_density: float "Density" #+ * SPHFluidSettings.rest_length -> rest_length: float "The Spring Rest Length (factor of interaction radius)" - + * SPHFluidSettings.spring_k -> spring_force: float "Spring force constant" - + * SPHFluidSettings.stiffness_k -> stiffness: float "Constant K - Stiffness" - + * SPHFluidSettings.stiffness_knear -> stiffness_near: float "Repulsion factor: stiffness_knear" +#SPHFluidSettings.spring_force -> spring_force: float "Spring force constant" +#SPHFluidSettings.stiffness -> stiffness: float "Constant K - Stiffness" +#SPHFluidSettings.stiffness_near -> stiffness_near: float "Repulsion factor: stiffness_knear" #+ * SPHFluidSettings.viscosity_beta -> viscosity_beta: float "Square viscosity factor" #+ * SPHFluidSettings.viscosity_omega -> viscosity_omega: float "Linear viscosity" #+ * SceneBases.active -> active: pointer "Active object base in the scene" @@ -3170,8 +3177,8 @@ #+ * SceneGameData.dome_text -> dome_text: pointer "Custom Warp Mesh data file" #+ * SceneGameData.dome_tilt -> dome_tilt: int "Camera rotation in horizontal axis" #+ * SceneGameData.fps -> fps: int "The nominal number of game frames per second. Physics fixed timestep = 1/fps, independently of actual frame rate" - + * SceneGameData.framing_color -> frame_color: float[3] "Set colour of the bars" - + * SceneGameData.framing_type -> frame_type: enum "Select the type of Framing you want" +#SceneGameData.frame_color -> frame_color: float[3] "Set colour of the bars" +#SceneGameData.frame_type -> frame_type: enum "Select the type of Framing you want" #+ * SceneGameData.frequency -> frequency: int "Displays clock frequency of fullscreen display" #+ * SceneGameData.logic_step_max -> logic_step_max: int "Sets the maximum number of logic frame per game frame if graphics slows down the game, higher value allows better synchronization with physics" #+ * SceneGameData.material_mode -> material_mode: enum "Material mode to use for rendering" @@ -3187,20 +3194,20 @@ #SceneGameData.show_fullscreen -> show_fullscreen: boolean "Starts player in a new fullscreen display" #+ * SceneGameData.show_physics_visualization -> show_physics_visualization: boolean "Show a visualization of physics bounds and interactions" #+ * SceneGameData.stereo -> stereo: enum "NO DESCRIPTION" - + * SceneGameData.eye_separation -> stereo_eye_separation: float "Set the distance between the eyes - the camera focal length/30 should be fine" +#SceneGameData.stereo_eye_separation -> stereo_eye_separation: float "Set the distance between the eyes - the camera focal length/30 should be fine" #+ * SceneGameData.stereo_mode -> stereo_mode: enum "Stereographic techniques" - + * SceneGameData.activity_culling -> use_activity_culling: boolean "Activity culling is enabled" +#SceneGameData.use_activity_culling -> use_activity_culling: boolean "Activity culling is enabled" #+ * SceneGameData.use_animation_record -> use_animation_record: boolean "Record animation to fcurves" - + * SceneGameData.auto_start -> use_auto_start: boolean "Automatically start game at load time" +#SceneGameData.use_auto_start -> use_auto_start: boolean "Automatically start game at load time" #+ * SceneGameData.use_deprecation_warnings -> use_deprecation_warnings: boolean "Print warnings when using deprecated features in the python API" #+ * SceneGameData.use_display_lists -> use_display_lists: boolean "Use display lists to speed up rendering by keeping geometry on the GPU" #+ * SceneGameData.use_frame_rate -> use_frame_rate: boolean "Respect the frame rate rather than rendering as many frames as possible" - + * SceneGameData.glsl_extra_textures -> use_glsl_extra_textures: boolean "Use extra textures like normal or specular maps for GLSL rendering" - + * SceneGameData.glsl_lights -> use_glsl_lights: boolean "Use lights for GLSL rendering" - + * SceneGameData.glsl_nodes -> use_glsl_nodes: boolean "Use nodes for GLSL rendering" - + * SceneGameData.glsl_ramps -> use_glsl_ramps: boolean "Use ramps for GLSL rendering" - + * SceneGameData.glsl_shaders -> use_glsl_shaders: boolean "Use shaders for GLSL rendering" - + * SceneGameData.glsl_shadows -> use_glsl_shadows: boolean "Use shadows for GLSL rendering" +#SceneGameData.use_glsl_extra_textures -> use_glsl_extra_textures: boolean "Use extra textures like normal or specular maps for GLSL rendering" +#SceneGameData.use_glsl_lights -> use_glsl_lights: boolean "Use lights for GLSL rendering" +#SceneGameData.use_glsl_nodes -> use_glsl_nodes: boolean "Use nodes for GLSL rendering" +#SceneGameData.use_glsl_ramps -> use_glsl_ramps: boolean "Use ramps for GLSL rendering" +#SceneGameData.use_glsl_shaders -> use_glsl_shaders: boolean "Use shaders for GLSL rendering" +#SceneGameData.use_glsl_shadows -> use_glsl_shadows: boolean "Use shadows for GLSL rendering" #+ * SceneGameData.use_occlusion_culling -> use_occlusion_culling: boolean "Use optimized Bullet DBVT tree for view frustum and occlusion culling" #+ * SceneObjects.active -> active: pointer "Active object for this scene" #SceneRenderLayer.exclude_ambient_occlusion -> exclude_ambient_occlusion: boolean "Exclude AO pass from combined" @@ -3309,12 +3316,12 @@ #+ * Sensor|RaySensor.ray_type -> ray_type: enum "Toggle collision on material or property" #Sensor|RaySensor.use_x_ray -> use_x_ray: boolean "Toggle X-Ray option (see through objects that dont have the property)" #+ * Sensor|TouchSensor.material -> material: pointer "Only look for objects with this material" - + * Sequence.blend_opacity -> blend_alpha: float "NO DESCRIPTION" - + * Sequence.blend_mode -> blend_type: enum "NO DESCRIPTION" +#Sequence.blend_alpha -> blend_alpha: float "NO DESCRIPTION" +#Sequence.blend_type -> blend_type: enum "NO DESCRIPTION" #+ * Sequence.channel -> channel: int "Y position of the sequence strip" #+ * Sequence.effect_fader -> effect_fader: float "NO DESCRIPTION" #Sequence.frame_duration -> frame_duration: int, "(read-only) The length of the contents of this strip before the handles are applied" - + * Sequence.frame_final_length -> frame_final_duration: int "The length of the contents of this strip before the handles are applied" +#Sequence.frame_final_duration -> frame_final_duration: int "The length of the contents of this strip before the handles are applied" #+ * Sequence.frame_final_end -> frame_final_end: int "End frame displayed in the sequence editor after offsets are applied" #+ * Sequence.frame_final_start -> frame_final_start: int "Start frame displayed in the sequence editor after offsets are applied, setting this is equivalent to moving the handle, not the actual start frame" #+ * Sequence.frame_offset_end -> frame_offset_end: int, "(read-only)" @@ -3330,17 +3337,17 @@ #+ * Sequence.select_right_handle -> select_right_handle: boolean "NO DESCRIPTION" #+ * Sequence.speed_fader -> speed_fader: float "NO DESCRIPTION" #+ * Sequence.type -> type: enum, "(read-only)" - + * Sequence.use_effect_default_fade -> use_default_fade: boolean "Fade effect using the built-in default (usually make transition as long as effect strip)" +#Sequence.use_default_fade -> use_default_fade: boolean "Fade effect using the built-in default (usually make transition as long as effect strip)" #+ * SequenceColorBalance.gain -> gain: float[3] "Color balance gain (highlights)" #+ * SequenceColorBalance.gamma -> gamma: float[3] "Color balance gamma (midtones)" - + * SequenceColorBalance.inverse_gain -> invert_gain: boolean "NO DESCRIPTION" - + * SequenceColorBalance.inverse_gamma -> invert_gamma: boolean "NO DESCRIPTION" - + * SequenceColorBalance.inverse_lift -> invert_lift: boolean "NO DESCRIPTION" +#SequenceColorBalance.invert_gain -> invert_gain: boolean "NO DESCRIPTION" +#SequenceColorBalance.invert_gamma -> invert_gamma: boolean "NO DESCRIPTION" +#SequenceColorBalance.invert_lift -> invert_lift: boolean "NO DESCRIPTION" #+ * SequenceColorBalance.lift -> lift: float[3] "Color balance lift (shadows)" - + * SequenceCrop.right -> max_x: int "NO DESCRIPTION" - + * SequenceCrop.top -> max_y: int "NO DESCRIPTION" - + * SequenceCrop.bottom -> min_x: int "NO DESCRIPTION" - + * SequenceCrop.left -> min_y: int "NO DESCRIPTION" +#SequenceCrop.max_x -> max_x: int "NO DESCRIPTION" +#SequenceCrop.max_y -> max_y: int "NO DESCRIPTION" +#SequenceCrop.min_x -> min_x: int "NO DESCRIPTION" +#SequenceCrop.min_y -> min_y: int "NO DESCRIPTION" #+ * SequenceEditor.active_strip -> active_strip: pointer "NO DESCRIPTION" #+ * SequenceEditor.meta_stack -> meta_stack: collection, "(read-only) Meta strip stack, last is currently edited meta strip" #+ * SequenceEditor.overlay_frame -> overlay_frame: int "Sequencers active strip" @@ -3354,7 +3361,7 @@ #+ * SequenceTransform.offset_x -> offset_x: int "NO DESCRIPTION" #+ * SequenceTransform.offset_y -> offset_y: int "NO DESCRIPTION" #+ * Sequence|EffectSequence.color_balance -> color_balance: pointer, "(read-only)" - + * Sequence|EffectSequence.multiply_colors -> color_multiply: float "NO DESCRIPTION" +#Sequence|EffectSequence.color_multiply -> color_multiply: float "NO DESCRIPTION" #+ * Sequence|EffectSequence.color_saturation -> color_saturation: float "NO DESCRIPTION" #+ * Sequence|EffectSequence.crop -> crop: pointer, "(read-only)" #+ * Sequence|EffectSequence.proxy -> proxy: pointer, "(read-only)" @@ -3362,28 +3369,28 @@ #+ * Sequence|EffectSequence.transform -> transform: pointer, "(read-only)" #+ * Sequence|EffectSequence.use_color_balance -> use_color_balance: boolean "(3-Way color correction) on input" #+ * Sequence|EffectSequence.use_crop -> use_crop: boolean "Crop image before processing" - + * Sequence|EffectSequence.de_interlace -> use_deinterlace: boolean "For video movies to remove fields" - + * Sequence|EffectSequence.flip_x -> use_flip_x: boolean "Flip on the X axis" - + * Sequence|EffectSequence.flip_y -> use_flip_y: boolean "Flip on the Y axis" - + * Sequence|EffectSequence.convert_float -> use_float: boolean "Convert input to float data" - + * Sequence|EffectSequence.premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" +#Sequence|EffectSequence.use_deinterlace -> use_deinterlace: boolean "For video movies to remove fields" +#Sequence|EffectSequence.use_flip_x -> use_flip_x: boolean "Flip on the X axis" +#Sequence|EffectSequence.use_flip_y -> use_flip_y: boolean "Flip on the Y axis" +#Sequence|EffectSequence.use_float -> use_float: boolean "Convert input to float data" +#Sequence|EffectSequence.use_premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" #+ * Sequence|EffectSequence.use_proxy -> use_proxy: boolean "Use a preview proxy for this strip" - + * Sequence|EffectSequence.proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" - + * Sequence|EffectSequence.proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" - + * Sequence|EffectSequence.reverse_frames -> use_reverse_frames: boolean "Reverse frame order" +#Sequence|EffectSequence.use_proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" +#Sequence|EffectSequence.use_proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" +#Sequence|EffectSequence.use_reverse_frames -> use_reverse_frames: boolean "Reverse frame order" #+ * Sequence|EffectSequence.use_translation -> use_translation: boolean "Translate image before processing" #+ * Sequence|EffectSequence|ColorSequence.color -> color: float[3] "NO DESCRIPTION" - + * Sequence|EffectSequence|GlowSequence.blur_distance -> blur_radius: float "Radius of glow effect" +#Sequence|EffectSequence|GlowSequence.blur_radius -> blur_radius: float "Radius of glow effect" #+ * Sequence|EffectSequence|GlowSequence.boost_factor -> boost_factor: float "Brightness multiplier" #+ * Sequence|EffectSequence|GlowSequence.clamp -> clamp: float "rightness limit of intensity" #+ * Sequence|EffectSequence|GlowSequence.quality -> quality: int "Accuracy of the blur effect" #+ * Sequence|EffectSequence|GlowSequence.threshold -> threshold: float "Minimum intensity to trigger a glow" - + * Sequence|EffectSequence|GlowSequence.only_boost -> use_only_boost: boolean "Show the glow buffer only" +#Sequence|EffectSequence|GlowSequence.use_only_boost -> use_only_boost: boolean "Show the glow buffer only" #+ * Sequence|EffectSequence|PluginSequence.filename -> filename: string, "(read-only)" #+ * Sequence|EffectSequence|SpeedControlSequence.global_speed -> global_speed: float "NO DESCRIPTION" - + * Sequence|EffectSequence|SpeedControlSequence.curve_compress_y -> use_curve_compress_y: boolean "Scale F-Curve value to get the target frame number, F-Curve value runs from 0.0 to 1.0" - + * Sequence|EffectSequence|SpeedControlSequence.curve_velocity -> use_curve_velocity: boolean "Interpret the F-Curve value as a velocity instead of a frame number" - + * Sequence|EffectSequence|SpeedControlSequence.frame_blending -> use_frame_blend: boolean "Blend two frames into the target for a smoother result" +#Sequence|EffectSequence|SpeedControlSequence.use_curve_compress_y -> use_curve_compress_y: boolean "Scale F-Curve value to get the target frame number, F-Curve value runs from 0.0 to 1.0" +#Sequence|EffectSequence|SpeedControlSequence.use_curve_velocity -> use_curve_velocity: boolean "Interpret the F-Curve value as a velocity instead of a frame number" +#Sequence|EffectSequence|SpeedControlSequence.use_frame_blend -> use_frame_blend: boolean "Blend two frames into the target for a smoother result" #+ * Sequence|EffectSequence|TransformSequence.interpolation -> interpolation: enum "NO DESCRIPTION" #+ * Sequence|EffectSequence|TransformSequence.rotation_start -> rotation_start: float "NO DESCRIPTION" #+ * Sequence|EffectSequence|TransformSequence.scale_start_x -> scale_start_x: float "NO DESCRIPTION" @@ -3391,15 +3398,15 @@ #+ * Sequence|EffectSequence|TransformSequence.translate_start_x -> translate_start_x: float "NO DESCRIPTION" #+ * Sequence|EffectSequence|TransformSequence.translate_start_y -> translate_start_y: float "NO DESCRIPTION" #+ * Sequence|EffectSequence|TransformSequence.translation_unit -> translation_unit: enum "NO DESCRIPTION" - + * Sequence|EffectSequence|TransformSequence.uniform_scale -> use_uniform_scale: boolean "Scale uniformly, preserving aspect ratio" +#Sequence|EffectSequence|TransformSequence.use_uniform_scale -> use_uniform_scale: boolean "Scale uniformly, preserving aspect ratio" #+ * Sequence|EffectSequence|WipeSequence.angle -> angle: float "Edge angle" #+ * Sequence|EffectSequence|WipeSequence.blur_width -> blur_width: float "Width of the blur edge, in percentage relative to the image size" #+ * Sequence|EffectSequence|WipeSequence.direction -> direction: enum "Wipe direction" #+ * Sequence|EffectSequence|WipeSequence.transition_type -> transition_type: enum "NO DESCRIPTION" - + * Sequence|ImageSequence.animation_end_offset -> animation_offset_end: int "Animation end offset (trim end)" - + * Sequence|ImageSequence.animation_start_offset -> animation_offset_start: int "Animation start offset (trim start)" +#Sequence|ImageSequence.animation_offset_end -> animation_offset_end: int "Animation end offset (trim end)" +#Sequence|ImageSequence.animation_offset_start -> animation_offset_start: int "Animation start offset (trim start)" #+ * Sequence|ImageSequence.color_balance -> color_balance: pointer, "(read-only)" - + * Sequence|ImageSequence.multiply_colors -> color_multiply: float "NO DESCRIPTION" +#Sequence|ImageSequence.color_multiply -> color_multiply: float "NO DESCRIPTION" #+ * Sequence|ImageSequence.color_saturation -> color_saturation: float "NO DESCRIPTION" #+ * Sequence|ImageSequence.crop -> crop: pointer, "(read-only)" #+ * Sequence|ImageSequence.directory -> directory: string "NO DESCRIPTION" @@ -3409,20 +3416,20 @@ #+ * Sequence|ImageSequence.transform -> transform: pointer, "(read-only)" #+ * Sequence|ImageSequence.use_color_balance -> use_color_balance: boolean "(3-Way color correction) on input" #+ * Sequence|ImageSequence.use_crop -> use_crop: boolean "Crop image before processing" - + * Sequence|ImageSequence.de_interlace -> use_deinterlace: boolean "For video movies to remove fields" - + * Sequence|ImageSequence.flip_x -> use_flip_x: boolean "Flip on the X axis" - + * Sequence|ImageSequence.flip_y -> use_flip_y: boolean "Flip on the Y axis" - + * Sequence|ImageSequence.convert_float -> use_float: boolean "Convert input to float data" - + * Sequence|ImageSequence.premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" +#Sequence|ImageSequence.use_deinterlace -> use_deinterlace: boolean "For video movies to remove fields" +#Sequence|ImageSequence.use_flip_x -> use_flip_x: boolean "Flip on the X axis" +#Sequence|ImageSequence.use_flip_y -> use_flip_y: boolean "Flip on the Y axis" +#Sequence|ImageSequence.use_float -> use_float: boolean "Convert input to float data" +#Sequence|ImageSequence.use_premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" #+ * Sequence|ImageSequence.use_proxy -> use_proxy: boolean "Use a preview proxy for this strip" - + * Sequence|ImageSequence.proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" - + * Sequence|ImageSequence.proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" - + * Sequence|ImageSequence.reverse_frames -> use_reverse_frames: boolean "Reverse frame order" +#Sequence|ImageSequence.use_proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" +#Sequence|ImageSequence.use_proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" +#Sequence|ImageSequence.use_reverse_frames -> use_reverse_frames: boolean "Reverse frame order" #+ * Sequence|ImageSequence.use_translation -> use_translation: boolean "Translate image before processing" - + * Sequence|MetaSequence.animation_end_offset -> animation_offset_end: int "Animation end offset (trim end)" - + * Sequence|MetaSequence.animation_start_offset -> animation_offset_start: int "Animation start offset (trim start)" +#Sequence|MetaSequence.animation_offset_end -> animation_offset_end: int "Animation end offset (trim end)" +#Sequence|MetaSequence.animation_offset_start -> animation_offset_start: int "Animation start offset (trim start)" #+ * Sequence|MetaSequence.color_balance -> color_balance: pointer, "(read-only)" - + * Sequence|MetaSequence.multiply_colors -> color_multiply: float "NO DESCRIPTION" +#Sequence|MetaSequence.color_multiply -> color_multiply: float "NO DESCRIPTION" #+ * Sequence|MetaSequence.color_saturation -> color_saturation: float "NO DESCRIPTION" #+ * Sequence|MetaSequence.crop -> crop: pointer, "(read-only)" #+ * Sequence|MetaSequence.proxy -> proxy: pointer, "(read-only)" @@ -3431,20 +3438,20 @@ #+ * Sequence|MetaSequence.transform -> transform: pointer, "(read-only)" #+ * Sequence|MetaSequence.use_color_balance -> use_color_balance: boolean "(3-Way color correction) on input" #+ * Sequence|MetaSequence.use_crop -> use_crop: boolean "Crop image before processing" - + * Sequence|MetaSequence.de_interlace -> use_deinterlace: boolean "For video movies to remove fields" - + * Sequence|MetaSequence.flip_x -> use_flip_x: boolean "Flip on the X axis" - + * Sequence|MetaSequence.flip_y -> use_flip_y: boolean "Flip on the Y axis" - + * Sequence|MetaSequence.convert_float -> use_float: boolean "Convert input to float data" - + * Sequence|MetaSequence.premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" +#Sequence|MetaSequence.use_deinterlace -> use_deinterlace: boolean "For video movies to remove fields" +#Sequence|MetaSequence.use_flip_x -> use_flip_x: boolean "Flip on the X axis" +#Sequence|MetaSequence.use_flip_y -> use_flip_y: boolean "Flip on the Y axis" +#Sequence|MetaSequence.use_float -> use_float: boolean "Convert input to float data" +#Sequence|MetaSequence.use_premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" #+ * Sequence|MetaSequence.use_proxy -> use_proxy: boolean "Use a preview proxy for this strip" - + * Sequence|MetaSequence.proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" - + * Sequence|MetaSequence.proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" - + * Sequence|MetaSequence.reverse_frames -> use_reverse_frames: boolean "Reverse frame order" +#Sequence|MetaSequence.use_proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" +#Sequence|MetaSequence.use_proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" +#Sequence|MetaSequence.use_reverse_frames -> use_reverse_frames: boolean "Reverse frame order" #+ * Sequence|MetaSequence.use_translation -> use_translation: boolean "Translate image before processing" - + * Sequence|MovieSequence.animation_end_offset -> animation_offset_end: int "Animation end offset (trim end)" - + * Sequence|MovieSequence.animation_start_offset -> animation_offset_start: int "Animation start offset (trim start)" +#Sequence|MovieSequence.animation_offset_end -> animation_offset_end: int "Animation end offset (trim end)" +#Sequence|MovieSequence.animation_offset_start -> animation_offset_start: int "Animation start offset (trim start)" #+ * Sequence|MovieSequence.color_balance -> color_balance: pointer, "(read-only)" - + * Sequence|MovieSequence.multiply_colors -> color_multiply: float "NO DESCRIPTION" +#Sequence|MovieSequence.color_multiply -> color_multiply: float "NO DESCRIPTION" #+ * Sequence|MovieSequence.color_saturation -> color_saturation: float "NO DESCRIPTION" #+ * Sequence|MovieSequence.crop -> crop: pointer, "(read-only)" #+ * Sequence|MovieSequence.filepath -> filepath: string "NO DESCRIPTION" @@ -3454,20 +3461,20 @@ #+ * Sequence|MovieSequence.transform -> transform: pointer, "(read-only)" #+ * Sequence|MovieSequence.use_color_balance -> use_color_balance: boolean "(3-Way color correction) on input" #+ * Sequence|MovieSequence.use_crop -> use_crop: boolean "Crop image before processing" - + * Sequence|MovieSequence.de_interlace -> use_deinterlace: boolean "For video movies to remove fields" - + * Sequence|MovieSequence.flip_x -> use_flip_x: boolean "Flip on the X axis" - + * Sequence|MovieSequence.flip_y -> use_flip_y: boolean "Flip on the Y axis" - + * Sequence|MovieSequence.convert_float -> use_float: boolean "Convert input to float data" - + * Sequence|MovieSequence.premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" +#Sequence|MovieSequence.use_deinterlace -> use_deinterlace: boolean "For video movies to remove fields" +#Sequence|MovieSequence.use_flip_x -> use_flip_x: boolean "Flip on the X axis" +#Sequence|MovieSequence.use_flip_y -> use_flip_y: boolean "Flip on the Y axis" +#Sequence|MovieSequence.use_float -> use_float: boolean "Convert input to float data" +#Sequence|MovieSequence.use_premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" #+ * Sequence|MovieSequence.use_proxy -> use_proxy: boolean "Use a preview proxy for this strip" - + * Sequence|MovieSequence.proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" - + * Sequence|MovieSequence.proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" - + * Sequence|MovieSequence.reverse_frames -> use_reverse_frames: boolean "Reverse frame order" +#Sequence|MovieSequence.use_proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" +#Sequence|MovieSequence.use_proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" +#Sequence|MovieSequence.use_reverse_frames -> use_reverse_frames: boolean "Reverse frame order" #+ * Sequence|MovieSequence.use_translation -> use_translation: boolean "Translate image before processing" - + * Sequence|MulticamSequence.animation_end_offset -> animation_offset_end: int "Animation end offset (trim end)" - + * Sequence|MulticamSequence.animation_start_offset -> animation_offset_start: int "Animation start offset (trim start)" +#Sequence|MulticamSequence.animation_offset_end -> animation_offset_end: int "Animation end offset (trim end)" +#Sequence|MulticamSequence.animation_offset_start -> animation_offset_start: int "Animation start offset (trim start)" #+ * Sequence|MulticamSequence.color_balance -> color_balance: pointer, "(read-only)" - + * Sequence|MulticamSequence.multiply_colors -> color_multiply: float "NO DESCRIPTION" +#Sequence|MulticamSequence.color_multiply -> color_multiply: float "NO DESCRIPTION" #+ * Sequence|MulticamSequence.color_saturation -> color_saturation: float "NO DESCRIPTION" #+ * Sequence|MulticamSequence.crop -> crop: pointer, "(read-only)" #+ * Sequence|MulticamSequence.multicam_source -> multicam_source: int "NO DESCRIPTION" @@ -3476,20 +3483,20 @@ #+ * Sequence|MulticamSequence.transform -> transform: pointer, "(read-only)" #+ * Sequence|MulticamSequence.use_color_balance -> use_color_balance: boolean "(3-Way color correction) on input" #+ * Sequence|MulticamSequence.use_crop -> use_crop: boolean "Crop image before processing" - + * Sequence|MulticamSequence.de_interlace -> use_deinterlace: boolean "For video movies to remove fields" - + * Sequence|MulticamSequence.flip_x -> use_flip_x: boolean "Flip on the X axis" - + * Sequence|MulticamSequence.flip_y -> use_flip_y: boolean "Flip on the Y axis" - + * Sequence|MulticamSequence.convert_float -> use_float: boolean "Convert input to float data" - + * Sequence|MulticamSequence.premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" +#Sequence|MulticamSequence.use_deinterlace -> use_deinterlace: boolean "For video movies to remove fields" +#Sequence|MulticamSequence.use_flip_x -> use_flip_x: boolean "Flip on the X axis" +#Sequence|MulticamSequence.use_flip_y -> use_flip_y: boolean "Flip on the Y axis" +#Sequence|MulticamSequence.use_float -> use_float: boolean "Convert input to float data" +#Sequence|MulticamSequence.use_premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" #+ * Sequence|MulticamSequence.use_proxy -> use_proxy: boolean "Use a preview proxy for this strip" - + * Sequence|MulticamSequence.proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" - + * Sequence|MulticamSequence.proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" - + * Sequence|MulticamSequence.reverse_frames -> use_reverse_frames: boolean "Reverse frame order" +#Sequence|MulticamSequence.use_proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" +#Sequence|MulticamSequence.use_proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" +#Sequence|MulticamSequence.use_reverse_frames -> use_reverse_frames: boolean "Reverse frame order" #+ * Sequence|MulticamSequence.use_translation -> use_translation: boolean "Translate image before processing" - + * Sequence|SceneSequence.animation_end_offset -> animation_offset_end: int "Animation end offset (trim end)" - + * Sequence|SceneSequence.animation_start_offset -> animation_offset_start: int "Animation start offset (trim start)" +#Sequence|SceneSequence.animation_offset_end -> animation_offset_end: int "Animation end offset (trim end)" +#Sequence|SceneSequence.animation_offset_start -> animation_offset_start: int "Animation start offset (trim start)" #+ * Sequence|SceneSequence.color_balance -> color_balance: pointer, "(read-only)" - + * Sequence|SceneSequence.multiply_colors -> color_multiply: float "NO DESCRIPTION" +#Sequence|SceneSequence.color_multiply -> color_multiply: float "NO DESCRIPTION" #+ * Sequence|SceneSequence.color_saturation -> color_saturation: float "NO DESCRIPTION" #+ * Sequence|SceneSequence.crop -> crop: pointer, "(read-only)" #+ * Sequence|SceneSequence.proxy -> proxy: pointer, "(read-only)" @@ -3499,18 +3506,18 @@ #+ * Sequence|SceneSequence.transform -> transform: pointer, "(read-only)" #+ * Sequence|SceneSequence.use_color_balance -> use_color_balance: boolean "(3-Way color correction) on input" #+ * Sequence|SceneSequence.use_crop -> use_crop: boolean "Crop image before processing" - + * Sequence|SceneSequence.de_interlace -> use_deinterlace: boolean "For video movies to remove fields" - + * Sequence|SceneSequence.flip_x -> use_flip_x: boolean "Flip on the X axis" - + * Sequence|SceneSequence.flip_y -> use_flip_y: boolean "Flip on the Y axis" - + * Sequence|SceneSequence.convert_float -> use_float: boolean "Convert input to float data" - + * Sequence|SceneSequence.premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" +#Sequence|SceneSequence.use_deinterlace -> use_deinterlace: boolean "For video movies to remove fields" +#Sequence|SceneSequence.use_flip_x -> use_flip_x: boolean "Flip on the X axis" +#Sequence|SceneSequence.use_flip_y -> use_flip_y: boolean "Flip on the Y axis" +#Sequence|SceneSequence.use_float -> use_float: boolean "Convert input to float data" +#Sequence|SceneSequence.use_premultiply -> use_premultiply: boolean "Convert RGB from key alpha to premultiplied alpha" #+ * Sequence|SceneSequence.use_proxy -> use_proxy: boolean "Use a preview proxy for this strip" - + * Sequence|SceneSequence.proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" - + * Sequence|SceneSequence.proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" - + * Sequence|SceneSequence.reverse_frames -> use_reverse_frames: boolean "Reverse frame order" +#Sequence|SceneSequence.use_proxy_custom_directory -> use_proxy_custom_directory: boolean "Use a custom directory to store data" +#Sequence|SceneSequence.use_proxy_custom_file -> use_proxy_custom_file: boolean "Use a custom file to read proxy data from" +#Sequence|SceneSequence.use_reverse_frames -> use_reverse_frames: boolean "Reverse frame order" #+ * Sequence|SceneSequence.use_translation -> use_translation: boolean "Translate image before processing" - + * Sequence|SoundSequence.animation_end_offset -> animation_offset_end: int "Animation end offset (trim end)" - + * Sequence|SoundSequence.animation_start_offset -> animation_offset_start: int "Animation start offset (trim start)" +#Sequence|SoundSequence.animation_offset_end -> animation_offset_end: int "Animation end offset (trim end)" +#Sequence|SoundSequence.animation_offset_start -> animation_offset_start: int "Animation start offset (trim start)" #+ * Sequence|SoundSequence.attenuation -> attenuation: float "Attenuation in dezibel" #+ * Sequence|SoundSequence.filepath -> filepath: string "NO DESCRIPTION" #+ * Sequence|SoundSequence.sound -> sound: pointer, "(read-only) Sound datablock used by this sequence" @@ -3534,44 +3541,44 @@ #TODO BETTER NAME * SmokeDomainSettings.alpha -> alpha: float "Higher value results in sinking smoke" #+ * SmokeDomainSettings.amplify -> amplify: int "Enhance the resolution of smoke by this factor using noise" #TODO BETTER NAME * SmokeDomainSettings.beta -> beta: float "Higher value results in faster rising smoke" - + * SmokeDomainSettings.smoke_domain_colli -> collision_extents: enum "Selects which domain border will be treated as collision object." +#SmokeDomainSettings.collision_extents -> collision_extents: enum "Selects which domain border will be treated as collision object." #SmokeDomainSettings.collision_group -> collision_group: pointer "Limit collisions to this group" #+ * SmokeDomainSettings.dissolve_speed -> dissolve_speed: int "Dissolve Speed" #+ * SmokeDomainSettings.eff_group -> eff_group: pointer "Limit effectors to this group" #+ * SmokeDomainSettings.effector_weights -> effector_weights: pointer, "(read-only)" #+ * SmokeDomainSettings.fluid_group -> fluid_group: pointer "Limit fluid objects to this group" #+ * SmokeDomainSettings.noise_type -> noise_type: enum "Noise method which is used for creating the high resolution" - + * SmokeDomainSettings.smoke_cache_high_comp -> point_cache_compress_high_type: enum "Compression method to be used" - + * SmokeDomainSettings.smoke_cache_comp -> point_cache_compress_type: enum "Compression method to be used" +#SmokeDomainSettings.point_cache_compress_high_type -> point_cache_compress_high_type: enum "Compression method to be used" +#SmokeDomainSettings.point_cache_compress_type -> point_cache_compress_type: enum "Compression method to be used" #+ * SmokeDomainSettings.point_cache_high -> point_cache_high: pointer, "(read-only)" #+ * SmokeDomainSettings.point_cache_low -> point_cache_low: pointer, "(read-only)" - + * SmokeDomainSettings.maxres -> resolution_max: int "Maximal resolution used in the fluid domain" +#SmokeDomainSettings.resolution_max -> resolution_max: int "Maximal resolution used in the fluid domain" #SmokeDomainSettings.show_high_resolution -> show_high_resolution: boolean "Show high resolution (using amplification)" - + * SmokeDomainSettings.smoothemitter -> smooth_emitter: boolean "Smoothens emitted smoke to avoid blockiness." +#SmokeDomainSettings.smooth_emitter -> smooth_emitter: boolean "Smoothens emitted smoke to avoid blockiness." #+ * SmokeDomainSettings.strength -> strength: float "Strength of wavelet noise" #+ * SmokeDomainSettings.time_scale -> time_scale: float "Adjust simulation speed." - + * SmokeDomainSettings.dissolve_smoke -> use_dissolve_smoke: boolean "Enable smoke to disappear over time" - + * SmokeDomainSettings.dissolve_smoke_log -> use_dissolve_smoke_log: boolean "Using 1/x" - + * SmokeDomainSettings.highres -> use_high_resolution: boolean "Enable high resolution (using amplification)" +#SmokeDomainSettings.use_dissolve_smoke -> use_dissolve_smoke: boolean "Enable smoke to disappear over time" +#SmokeDomainSettings.use_dissolve_smoke_log -> use_dissolve_smoke_log: boolean "Using 1/x" +#SmokeDomainSettings.use_high_resolution -> use_high_resolution: boolean "Enable high resolution (using amplification)" #+ * SmokeDomainSettings.vorticity -> vorticity: float "Amount of turbulence/rotation in fluid." #+ * SmokeFlowSettings.density -> density: float "NO DESCRIPTION" #+ * SmokeFlowSettings.initial_velocity -> initial_velocity: boolean "Smoke inherits its velocity from the emitter particle" #SmokeFlowSettings.particle_system -> particle_system: pointer "Particle systems emitted from the object" #+ * SmokeFlowSettings.temperature -> temperature: float "Temperature difference to ambient temperature" #SmokeFlowSettings.use_absolute -> use_absolute: boolean "Only allows given density value in emitter area." - +NEGATE * SmokeFlowSettings.outflow -> use_outflow: boolean "Deletes smoke from simulation" - + * SmokeFlowSettings.velocity_multiplier -> velocity_factor: float "Multiplier to adjust velocity passed to smoke" +#SmokeFlowSettings.use_outflow -> use_outflow: boolean "Deletes smoke from simulation" +#SmokeFlowSettings.velocity_factor -> velocity_factor: float "Multiplier to adjust velocity passed to smoke" #+ * SoftBodySettings.aero -> aero: float "Make edges sail" #+ * SoftBodySettings.aerodynamics_type -> aerodynamics_type: enum "Method of calculating aerodynamic interaction" #+ * SoftBodySettings.ball_damp -> ball_damp: float "Blending to inelastic collision" #+ * SoftBodySettings.ball_size -> ball_size: float "Absolute ball size or factor if not manual adjusted" #+ * SoftBodySettings.ball_stiff -> ball_stiff: float "Ball inflating pressure" - + * SoftBodySettings.bending -> bend: float "Bending Stiffness" +#SoftBodySettings.bend -> bend: float "Bending Stiffness" #+ * SoftBodySettings.choke -> choke: int "Viscosity inside collision target" #+ * SoftBodySettings.collision_type -> collision_type: enum "Choose Collision Type" - + * SoftBodySettings.damp -> damping: float "Edge spring friction" +#SoftBodySettings.damping -> damping: float "Edge spring friction" #+ * SoftBodySettings.effector_weights -> effector_weights: pointer, "(read-only)" - + * SoftBodySettings.error_limit -> error_threshold: float "The Runge-Kutta ODE solver error limit, low value gives more precision, high values speed" +#SoftBodySettings.error_threshold -> error_threshold: float "The Runge-Kutta ODE solver error limit, low value gives more precision, high values speed" #+ * SoftBodySettings.friction -> friction: float "General media friction for point movements" #+ * SoftBodySettings.fuzzy -> fuzzy: int "Fuzziness while on collision, high values make collsion handling faster but less stable" #+ * SoftBodySettings.goal_default -> goal_default: float "Default Goal (vertex target position) value, when no Vertex Group used" @@ -3581,29 +3588,29 @@ #+ * SoftBodySettings.goal_spring -> goal_spring: float "Goal (vertex target position) spring stiffness" #+ * SoftBodySettings.goal_vertex_group -> goal_vertex_group: string "Control point weight values" #+ * SoftBodySettings.gravity -> gravity: float "Apply gravitation to point movement" - + * SoftBodySettings.lcom -> location_mass_center: float[3] "Location of Center of mass" +#SoftBodySettings.location_mass_center -> location_mass_center: float[3] "Location of Center of mass" #+ * SoftBodySettings.mass -> mass: float "General Mass value" #+ * SoftBodySettings.mass_vertex_group -> mass_vertex_group: string "Control point mass values" #+ * SoftBodySettings.plastic -> plastic: float "Permanent deform" #+ * SoftBodySettings.pull -> pull: float "Edge spring stiffness when longer than rest length" #+ * SoftBodySettings.push -> push: float "Edge spring stiffness when shorter than rest length" - + * SoftBodySettings.lrot -> rotation_estimate: float[9] "Estimated rotation matrix" - + * SoftBodySettings.lscale -> scale_estimate: float[9] "Estimated scale matrix" +#SoftBodySettings.rotation_estimate -> rotation_estimate: float[9] "Estimated rotation matrix" +#SoftBodySettings.scale_estimate -> scale_estimate: float[9] "Estimated scale matrix" #+ * SoftBodySettings.shear -> shear: float "Shear Stiffness" #+ * SoftBodySettings.speed -> speed: float "Tweak timing for physics to control frequency and speed" #+ * SoftBodySettings.spring_length -> spring_length: float "Alter spring length to shrink/blow up (unit %) 0 to disable" #+ * SoftBodySettings.spring_vertex_group -> spring_vertex_group: string "Control point spring strength values" - + * SoftBodySettings.maxstep -> step_max: int "Maximal # solver steps/frame" - + * SoftBodySettings.minstep -> step_min: int "Minimal # solver steps/frame" +#SoftBodySettings.step_max -> step_max: int "Maximal # solver steps/frame" +#SoftBodySettings.step_min -> step_min: int "Minimal # solver steps/frame" #SoftBodySettings.use_auto_step -> use_auto_step: boolean "Use velocities for automagic step sizes" - + * SoftBodySettings.diagnose -> use_diagnose: boolean "Turn on SB diagnose console prints" - + * SoftBodySettings.edge_collision -> use_edge_collision: boolean "Edges collide too" +#SoftBodySettings.use_diagnose -> use_diagnose: boolean "Turn on SB diagnose console prints" +#SoftBodySettings.use_edge_collision -> use_edge_collision: boolean "Edges collide too" #+ * SoftBodySettings.use_edges -> use_edges: boolean "Use Edges as springs" - + * SoftBodySettings.estimate_matrix -> use_estimate_matrix: boolean "estimate matrix .. split to COM , ROT ,SCALE" - + * SoftBodySettings.face_collision -> use_face_collision: boolean "Faces collide too, can be very slow" +#SoftBodySettings.use_estimate_matrix -> use_estimate_matrix: boolean "estimate matrix .. split to COM , ROT ,SCALE" +#SoftBodySettings.use_face_collision -> use_face_collision: boolean "Faces collide too, can be very slow" #+ * SoftBodySettings.use_goal -> use_goal: boolean "Define forces for vertices to stick to animated position" - + * SoftBodySettings.self_collision -> use_self_collision: boolean "Enable naive vertex ball self collision" - + * SoftBodySettings.stiff_quads -> use_stiff_quads: boolean "Adds diagonal springs on 4-gons" +#SoftBodySettings.use_self_collision -> use_self_collision: boolean "Enable naive vertex ball self collision" +#SoftBodySettings.use_stiff_quads -> use_stiff_quads: boolean "Adds diagonal springs on 4-gons" #+ * Space.type -> type: enum, "(read-only) Space data type" #+ * SpaceUVEditor.cursor_location -> cursor_location: float[2] "2D cursor location for this view" #+ * SpaceUVEditor.draw_stretch_type -> draw_stretch_type: enum "Type of stretch to draw" @@ -3800,12 +3807,12 @@ #+ * Spline.resolution_v -> resolution_v: int "Surface subdivisions per segment" #+ * Spline.tilt_interpolation -> tilt_interpolation: enum "The type of tilt interpolation for 3D, Bezier curves" #+ * Spline.type -> type: enum "The interpolation type for this curve element" - + * Spline.bezier_u -> use_bezier_u: boolean "Make this nurbs curve or surface act like a bezier spline in the U direction (Order U must be 3 or 4, Cyclic U must be disabled)" - + * Spline.bezier_v -> use_bezier_v: boolean "Make this nurbs surface act like a bezier spline in the V direction (Order V must be 3 or 4, Cyclic V must be disabled)" - + * Spline.cyclic_u -> use_cyclic_u: boolean "Make this curve or surface a closed loop in the U direction" - + * Spline.cyclic_v -> use_cyclic_v: boolean "Make this surface a closed loop in the V direction" - + * Spline.endpoint_u -> use_endpoint_u: boolean "Make this nurbs curve or surface meet the endpoints in the U direction (Cyclic U must be disabled)" - + * Spline.endpoint_v -> use_endpoint_v: boolean "Make this nurbs surface meet the endpoints in the V direction (Cyclic V must be disabled)" +#Spline.use_bezier_u -> use_bezier_u: boolean "Make this nurbs curve or surface act like a bezier spline in the U direction (Order U must be 3 or 4, Cyclic U must be disabled)" +#Spline.use_bezier_v -> use_bezier_v: boolean "Make this nurbs surface act like a bezier spline in the V direction (Order V must be 3 or 4, Cyclic V must be disabled)" +#Spline.use_cyclic_u -> use_cyclic_u: boolean "Make this curve or surface a closed loop in the U direction" +#Spline.use_cyclic_v -> use_cyclic_v: boolean "Make this surface a closed loop in the V direction" +#Spline.use_endpoint_u -> use_endpoint_u: boolean "Make this nurbs curve or surface meet the endpoints in the U direction (Cyclic U must be disabled)" +#Spline.use_endpoint_v -> use_endpoint_v: boolean "Make this nurbs surface meet the endpoints in the V direction (Cyclic V must be disabled)" #Spline.use_smooth -> use_smooth: boolean "Smooth the normals of the surface or beveled curve" #+ * SplinePoint.co -> co: float[4] "Point coordinates" #+ * SplinePoint.hide -> hide: boolean "Visibility status" @@ -3823,23 +3830,23 @@ #+ * Struct.nested -> nested: pointer, "(read-only) Struct in which this struct is always nested, and to which it logically belongs" #+ * Struct.properties -> properties: collection, "(read-only) Properties in the struct" #+ * TexMapping.location -> location: float[3] "NO DESCRIPTION" - + * TexMapping.maximum -> max: float[3] "Maximum value for clipping" - + * TexMapping.minimum -> min: float[3] "Minimum value for clipping" +#TexMapping.max -> max: float[3] "Maximum value for clipping" +#TexMapping.min -> min: float[3] "Minimum value for clipping" #+ * TexMapping.rotation -> rotation: float[3] "NO DESCRIPTION" #+ * TexMapping.scale -> scale: float[3] "NO DESCRIPTION" - + * TexMapping.has_maximum -> use_max: boolean "Whether to use maximum clipping value" - + * TexMapping.has_minimum -> use_min: boolean "Whether to use minimum clipping value" +#TexMapping.use_max -> use_max: boolean "Whether to use maximum clipping value" +#TexMapping.use_min -> use_min: boolean "Whether to use minimum clipping value" #+ * TextBox.height -> height: float "NO DESCRIPTION" #+ * TextBox.width -> width: float "NO DESCRIPTION" #+ * TextBox.x -> x: float "NO DESCRIPTION" #+ * TextBox.y -> y: float "NO DESCRIPTION" - + * TextCharacterFormat.bold -> use_bold: boolean "NO DESCRIPTION" - + * TextCharacterFormat.italic -> use_italic: boolean "NO DESCRIPTION" +#TextCharacterFormat.use_bold -> use_bold: boolean "NO DESCRIPTION" +#TextCharacterFormat.use_italic -> use_italic: boolean "NO DESCRIPTION" #+ * TextCharacterFormat.use_small_caps -> use_small_caps: boolean "NO DESCRIPTION" - + * TextCharacterFormat.underline -> use_underline: boolean "NO DESCRIPTION" +#TextCharacterFormat.use_underline -> use_underline: boolean "NO DESCRIPTION" #+ * TextLine.body -> body: string "Text in the line" - + * TextMarker.end -> character_index_end: int, "(read-only) Start position of the marker in the line" - + * TextMarker.start -> character_index_start: int, "(read-only) Start position of the marker in the line" +#TextMarker.character_index_end -> character_index_end: int, "(read-only) Start position of the marker in the line" +#TextMarker.character_index_start -> character_index_start: int, "(read-only) Start position of the marker in the line" #+ * TextMarker.color -> color: float[4] "Color to display the marker with" #+ * TextMarker.group -> group: int, "(read-only)" #TextMarker.is_temporary -> is_temporary: boolean, "(read-only) Marker is temporary" @@ -3848,84 +3855,84 @@ #+ * TextureSlot.blend_type -> blend_type: enum "NO DESCRIPTION" #+ * TextureSlot.color -> color: float[3] "The default color for textures that dont return RGB" #+ * TextureSlot.default_value -> default_value: float "Value to use for Ref, Spec, Amb, Emit, Alpha, RayMir, TransLu and Hard" - + * TextureSlot.negate -> invert: boolean "Inverts the values of the texture to reverse its effect" +#TextureSlot.invert -> invert: boolean "Inverts the values of the texture to reverse its effect" #+ * TextureSlot.name -> name: string, "(read-only) Texture slot name" #+ * TextureSlot.offset -> offset: float[3] "Fine tunes texture mapping X, Y and Z locations" #+ * TextureSlot.output_node -> output_node: enum "Which output node to use, for node-based textures" - + * TextureSlot.size -> scale: float[3] "Sets scaling for the textures X, Y and Z sizes" +#TextureSlot.scale -> scale: float[3] "Sets scaling for the textures X, Y and Z sizes" #+ * TextureSlot.texture -> texture: pointer "Texture datablock used by this texture slot" - + * TextureSlot.rgb_to_intensity -> use_rgb_to_intensity: boolean "Converts texture RGB values to intensity (gray) values" - + * TextureSlot.stencil -> use_stencil: boolean "Use this texture as a blending value on the next texture" +#TextureSlot.use_rgb_to_intensity -> use_rgb_to_intensity: boolean "Converts texture RGB values to intensity (gray) values" +#TextureSlot.use_stencil -> use_stencil: boolean "Use this texture as a blending value on the next texture" #+ * TextureSlot|BrushTextureSlot.angle -> angle: float "Defines brush texture rotation" #+ * TextureSlot|BrushTextureSlot.map_mode -> map_mode: enum "NO DESCRIPTION" #+ * TextureSlot|LampTextureSlot.color_factor -> color_factor: float "Amount texture affects color values" #+ * TextureSlot|LampTextureSlot.object -> object: pointer "Object to use for mapping with Object texture coordinates" #+ * TextureSlot|LampTextureSlot.shadow_factor -> shadow_factor: float "Amount texture affects shadow" - + * TextureSlot|LampTextureSlot.texture_coordinates -> texture_coords: enum "NO DESCRIPTION" - + * TextureSlot|LampTextureSlot.map_color -> use_map_color: boolean "Lets the texture affect the basic color of the lamp" - + * TextureSlot|LampTextureSlot.map_shadow -> use_map_shadow: boolean "Lets the texture affect the shadow color of the lamp" +#TextureSlot|LampTextureSlot.texture_coords -> texture_coords: enum "NO DESCRIPTION" +#TextureSlot|LampTextureSlot.use_map_color -> use_map_color: boolean "Lets the texture affect the basic color of the lamp" +#TextureSlot|LampTextureSlot.use_map_shadow -> use_map_shadow: boolean "Lets the texture affect the shadow color of the lamp" #+ * TextureSlot|MaterialTextureSlot.alpha_factor -> alpha_factor: float "Amount texture affects alpha" #+ * TextureSlot|MaterialTextureSlot.ambient_factor -> ambient_factor: float "Amount texture affects ambient" - + * TextureSlot|MaterialTextureSlot.coloremission_factor -> color_emission_factor: float "Amount texture affects emission color" +#TextureSlot|MaterialTextureSlot.color_emission_factor -> color_emission_factor: float "Amount texture affects emission color" #+ * TextureSlot|MaterialTextureSlot.density_factor -> density_factor: float "Amount texture affects density" - + * TextureSlot|MaterialTextureSlot.colordiff_factor -> diffuse_color_factor: float "Amount texture affects diffuse color" +#TextureSlot|MaterialTextureSlot.diffuse_color_factor -> diffuse_color_factor: float "Amount texture affects diffuse color" #+ * TextureSlot|MaterialTextureSlot.diffuse_factor -> diffuse_factor: float "Amount texture affects diffuse reflectivity" #+ * TextureSlot|MaterialTextureSlot.displacement_factor -> displacement_factor: float "Amount texture displaces the surface" #+ * TextureSlot|MaterialTextureSlot.emission_factor -> emission_factor: float "Amount texture affects emission" #+ * TextureSlot|MaterialTextureSlot.emit_factor -> emit_factor: float "Amount texture affects emission" #+ * TextureSlot|MaterialTextureSlot.hardness_factor -> hardness_factor: float "Amount texture affects hardness" #+ * TextureSlot|MaterialTextureSlot.mapping -> mapping: enum "NO DESCRIPTION" - + * TextureSlot|MaterialTextureSlot.x_mapping -> mapping_x: enum "NO DESCRIPTION" - + * TextureSlot|MaterialTextureSlot.y_mapping -> mapping_y: enum "NO DESCRIPTION" - + * TextureSlot|MaterialTextureSlot.z_mapping -> mapping_z: enum "NO DESCRIPTION" +#TextureSlot|MaterialTextureSlot.mapping_x -> mapping_x: enum "NO DESCRIPTION" +#TextureSlot|MaterialTextureSlot.mapping_y -> mapping_y: enum "NO DESCRIPTION" +#TextureSlot|MaterialTextureSlot.mapping_z -> mapping_z: enum "NO DESCRIPTION" #+ * TextureSlot|MaterialTextureSlot.mirror_factor -> mirror_factor: float "Amount texture affects mirror color" #+ * TextureSlot|MaterialTextureSlot.normal_factor -> normal_factor: float "Amount texture affects normal values" #+ * TextureSlot|MaterialTextureSlot.normal_map_space -> normal_map_space: enum "NO DESCRIPTION" #+ * TextureSlot|MaterialTextureSlot.object -> object: pointer "Object to use for mapping with Object texture coordinates" #+ * TextureSlot|MaterialTextureSlot.raymir_factor -> raymir_factor: float "Amount texture affects ray mirror" - + * TextureSlot|MaterialTextureSlot.colorreflection_factor -> reflection_color_factor: float "Amount texture affects color of out-scattered light" +#TextureSlot|MaterialTextureSlot.reflection_color_factor -> reflection_color_factor: float "Amount texture affects color of out-scattered light" #+ * TextureSlot|MaterialTextureSlot.reflection_factor -> reflection_factor: float "Amount texture affects brightness of out-scattered light" #+ * TextureSlot|MaterialTextureSlot.scattering_factor -> scattering_factor: float "Amount texture affects scattering" - + * TextureSlot|MaterialTextureSlot.colorspec_factor -> specular_color_factor: float "Amount texture affects specular color" +#TextureSlot|MaterialTextureSlot.specular_color_factor -> specular_color_factor: float "Amount texture affects specular color" #+ * TextureSlot|MaterialTextureSlot.specular_factor -> specular_factor: float "Amount texture affects specular reflectivity" - + * TextureSlot|MaterialTextureSlot.texture_coordinates -> texture_coords: enum "NO DESCRIPTION" +#TextureSlot|MaterialTextureSlot.texture_coords -> texture_coords: enum "NO DESCRIPTION" #+ * TextureSlot|MaterialTextureSlot.translucency_factor -> translucency_factor: float "Amount texture affects translucency" - + * TextureSlot|MaterialTextureSlot.colortransmission_factor -> transmission_color_factor: float "Amount texture affects result color after light has been scattered/absorbed" +#TextureSlot|MaterialTextureSlot.transmission_color_factor -> transmission_color_factor: float "Amount texture affects result color after light has been scattered/absorbed" #+ * TextureSlot|MaterialTextureSlot.use -> use: boolean "Enable this material texture slot" - + * TextureSlot|MaterialTextureSlot.from_dupli -> use_from_dupli: boolean "Duplis instanced from verts, faces or particles, inherit texture coordinate from their parent" - + * TextureSlot|MaterialTextureSlot.from_original -> use_from_original: boolean "Duplis derive their object coordinates from the original objects transformation" - + * TextureSlot|MaterialTextureSlot.map_alpha -> use_map_alpha: boolean "Causes the texture to affect the alpha value" - + * TextureSlot|MaterialTextureSlot.map_ambient -> use_map_ambient: boolean "Causes the texture to affect the value of ambient" - + * TextureSlot|MaterialTextureSlot.map_colordiff -> use_map_color_diff: boolean "Causes the texture to affect basic color of the material" - + * TextureSlot|MaterialTextureSlot.map_coloremission -> use_map_color_emission: boolean "Causes the texture to affect the color of emission" - + * TextureSlot|MaterialTextureSlot.map_colorreflection -> use_map_color_reflection: boolean "Causes the texture to affect the color of scattered light" - + * TextureSlot|MaterialTextureSlot.map_colorspec -> use_map_color_spec: boolean "Causes the texture to affect the specularity color" - + * TextureSlot|MaterialTextureSlot.map_colortransmission -> use_map_color_transmission: boolean "Causes the texture to affect the result color after other light has been scattered/absorbed" - + * TextureSlot|MaterialTextureSlot.map_density -> use_map_density: boolean "Causes the texture to affect the volumes density" - + * TextureSlot|MaterialTextureSlot.map_diffuse -> use_map_diffuse: boolean "Causes the texture to affect the value of the materials diffuse reflectivity" - + * TextureSlot|MaterialTextureSlot.map_displacement -> use_map_displacement: boolean "Let the texture displace the surface" - + * TextureSlot|MaterialTextureSlot.map_emission -> use_map_emission: boolean "Causes the texture to affect the volumes emission" - + * TextureSlot|MaterialTextureSlot.map_emit -> use_map_emit: boolean "Causes the texture to affect the emit value" - + * TextureSlot|MaterialTextureSlot.map_hardness -> use_map_hardness: boolean "Causes the texture to affect the hardness value" - + * TextureSlot|MaterialTextureSlot.map_mirror -> use_map_mirror: boolean "Causes the texture to affect the mirror color" - + * TextureSlot|MaterialTextureSlot.map_normal -> use_map_normal: boolean "Causes the texture to affect the rendered normal" - + * TextureSlot|MaterialTextureSlot.map_raymir -> use_map_raymir: boolean "Causes the texture to affect the ray-mirror value" - + * TextureSlot|MaterialTextureSlot.map_reflection -> use_map_reflect: boolean "Causes the texture to affect the reflected lights brightness" - + * TextureSlot|MaterialTextureSlot.map_scattering -> use_map_scatter: boolean "Causes the texture to affect the volumes scattering" - + * TextureSlot|MaterialTextureSlot.map_specular -> use_map_specular: boolean "Causes the texture to affect the value of specular reflectivity" - + * TextureSlot|MaterialTextureSlot.map_translucency -> use_map_translucency: boolean "Causes the texture to affect the translucency value" - + * TextureSlot|MaterialTextureSlot.map_warp -> use_map_warp: boolean "Let the texture warp texture coordinates of next channels" - +NEGATE * TextureSlot|MaterialTextureSlot.new_bump -> use_old_bump: boolean "Use new, corrected bump mapping code (backwards compatibility option)" +#TextureSlot|MaterialTextureSlot.use_from_dupli -> use_from_dupli: boolean "Duplis instanced from verts, faces or particles, inherit texture coordinate from their parent" +#TextureSlot|MaterialTextureSlot.use_from_original -> use_from_original: boolean "Duplis derive their object coordinates from the original objects transformation" +#TextureSlot|MaterialTextureSlot.use_map_alpha -> use_map_alpha: boolean "Causes the texture to affect the alpha value" +#TextureSlot|MaterialTextureSlot.use_map_ambient -> use_map_ambient: boolean "Causes the texture to affect the value of ambient" +#TextureSlot|MaterialTextureSlot.use_map_color_diffuse -> use_map_color_diffuse: boolean "Causes the texture to affect basic color of the material" +#TextureSlot|MaterialTextureSlot.use_map_color_emission -> use_map_color_emission: boolean "Causes the texture to affect the color of emission" +#TextureSlot|MaterialTextureSlot.use_map_color_reflection -> use_map_color_reflection: boolean "Causes the texture to affect the color of scattered light" +#TextureSlot|MaterialTextureSlot.use_map_color_spec -> use_map_color_spec: boolean "Causes the texture to affect the specularity color" +#TextureSlot|MaterialTextureSlot.use_map_color_transmission -> use_map_color_transmission: boolean "Causes the texture to affect the result color after other light has been scattered/absorbed" +#TextureSlot|MaterialTextureSlot.use_map_density -> use_map_density: boolean "Causes the texture to affect the volumes density" +#TextureSlot|MaterialTextureSlot.use_map_diffuse -> use_map_diffuse: boolean "Causes the texture to affect the value of the materials diffuse reflectivity" +#TextureSlot|MaterialTextureSlot.use_map_displacement -> use_map_displacement: boolean "Let the texture displace the surface" +#TextureSlot|MaterialTextureSlot.use_map_emission -> use_map_emission: boolean "Causes the texture to affect the volumes emission" +#TextureSlot|MaterialTextureSlot.use_map_emit -> use_map_emit: boolean "Causes the texture to affect the emit value" +#TextureSlot|MaterialTextureSlot.use_map_hardness -> use_map_hardness: boolean "Causes the texture to affect the hardness value" +#TextureSlot|MaterialTextureSlot.use_map_mirror -> use_map_mirror: boolean "Causes the texture to affect the mirror color" +#TextureSlot|MaterialTextureSlot.use_map_normal -> use_map_normal: boolean "Causes the texture to affect the rendered normal" +#TextureSlot|MaterialTextureSlot.use_map_raymir -> use_map_raymir: boolean "Causes the texture to affect the ray-mirror value" +#TextureSlot|MaterialTextureSlot.use_map_reflect -> use_map_reflect: boolean "Causes the texture to affect the reflected lights brightness" +#TextureSlot|MaterialTextureSlot.use_map_scatter -> use_map_scatter: boolean "Causes the texture to affect the volumes scattering" +#TextureSlot|MaterialTextureSlot.use_map_specular -> use_map_specular: boolean "Causes the texture to affect the value of specular reflectivity" +#TextureSlot|MaterialTextureSlot.use_map_translucency -> use_map_translucency: boolean "Causes the texture to affect the translucency value" +#TextureSlot|MaterialTextureSlot.use_map_warp -> use_map_warp: boolean "Let the texture warp texture coordinates of next channels" +#TextureSlot|MaterialTextureSlot.use_old_bump -> use_old_bump: boolean "Use old bump mapping (backwards compatibility option)" #+ * TextureSlot|MaterialTextureSlot.uv_layer -> uv_layer: string "UV layer to use for mapping with UV texture coordinates" #+ * TextureSlot|MaterialTextureSlot.warp_factor -> warp_factor: float "Amount texture affects texture coordinates of next channels" #+ * TextureSlot|WorldTextureSlot.blend_factor -> blend_factor: float "Amount texture affects color progression of the background" #+ * TextureSlot|WorldTextureSlot.horizon_factor -> horizon_factor: float "Amount texture affects color of the horizon" #+ * TextureSlot|WorldTextureSlot.object -> object: pointer "Object to use for mapping with Object texture coordinates" - + * TextureSlot|WorldTextureSlot.texture_coordinates -> texture_coords: enum "Texture coordinates used to map the texture onto the background" - + * TextureSlot|WorldTextureSlot.map_blend -> use_map_blend: boolean "Affect the color progression of the background" - + * TextureSlot|WorldTextureSlot.map_horizon -> use_map_horizon: boolean "Affect the color of the horizon" - + * TextureSlot|WorldTextureSlot.map_zenith_down -> use_map_zenith_down: boolean "Affect the color of the zenith below" - + * TextureSlot|WorldTextureSlot.map_zenith_up -> use_map_zenith_up: boolean "Affect the color of the zenith above" +#TextureSlot|WorldTextureSlot.texture_coords -> texture_coords: enum "Texture coordinates used to map the texture onto the background" +#TextureSlot|WorldTextureSlot.use_map_blend -> use_map_blend: boolean "Affect the color progression of the background" +#TextureSlot|WorldTextureSlot.use_map_horizon -> use_map_horizon: boolean "Affect the color of the horizon" +#TextureSlot|WorldTextureSlot.use_map_zenith_down -> use_map_zenith_down: boolean "Affect the color of the zenith below" +#TextureSlot|WorldTextureSlot.use_map_zenith_up -> use_map_zenith_up: boolean "Affect the color of the zenith above" #+ * TextureSlot|WorldTextureSlot.zenith_down_factor -> zenith_down_factor: float "Amount texture affects color of the zenith below" #+ * TextureSlot|WorldTextureSlot.zenith_up_factor -> zenith_up_factor: float "Amount texture affects color of the zenith above" #+ * Theme.bone_color_sets -> bone_color_sets: collection, "(read-only)" @@ -4562,23 +4569,23 @@ #+ * VoxelData.domain_object -> domain_object: pointer "Object used as the smoke simulation domain" #+ * VoxelData.extension -> extension: enum "Sets how the texture is extrapolated past its original bounds" #+ * VoxelData.file_format -> file_format: enum "Format of the source data set to render" - + * VoxelData.source_path -> filepath: string "The external source data file to use" +#VoxelData.filepath -> filepath: string "The external source data file to use" #+ * VoxelData.intensity -> intensity: float "Multiplier for intensity values" #+ * VoxelData.interpolation -> interpolation: enum "Method to interpolate/smooth values between voxel cells" #+ * VoxelData.resolution -> resolution: int[3] "Resolution of the voxel grid" #+ * VoxelData.smoke_data_type -> smoke_data_type: enum "Simulation value to be used as a texture" - + * VoxelData.still_frame_number -> still_frame: int "The frame number to always use" - + * VoxelData.still -> use_still_frame: boolean "Always render a still frame from the voxel data sequence" +#VoxelData.still_frame -> still_frame: int "The frame number to always use" +#VoxelData.use_still_frame -> use_still_frame: boolean "Always render a still frame from the voxel data sequence" #+ * Window.screen -> screen: pointer "Active screen showing in the window" #+ * WorldLighting.adapt_to_speed -> adapt_to_speed: float "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)" - + * WorldLighting.ao_blend_mode -> ao_blend_type: enum "Defines how AO mixes with material shading" +#WorldLighting.ao_blend_type -> ao_blend_type: enum "Defines how AO mixes with material shading" #+ * WorldLighting.ao_factor -> ao_factor: float "Factor for ambient occlusion blending" #+ * WorldLighting.bias -> bias: float "Bias (in radians) to prevent smoothed faces from showing banding (for Raytrace Constant Jittered)" #+ * WorldLighting.correction -> correction: float "Ad-hoc correction for over-occlusion due to the approximation (for Approximate)" #+ * WorldLighting.distance -> distance: float "Length of rays, defines how far away other faces give occlusion effect" #+ * WorldLighting.environment_color -> environment_color: enum "Defines where the color of the environment light comes from" #+ * WorldLighting.environment_energy -> environment_energy: float "Defines the strength of environment light" - + * WorldLighting.error_tolerance -> error_threshold: float "Low values are slower and higher quality (for Approximate)" +#WorldLighting.error_threshold -> error_threshold: float "Low values are slower and higher quality (for Approximate)" #+ * WorldLighting.falloff_strength -> falloff_strength: float "Distance attenuation factor, the higher, the shorter the shadows" #+ * WorldLighting.gather_method -> gather_method: enum "NO DESCRIPTION" #+ * WorldLighting.indirect_bounces -> indirect_bounces: int "Number of indirect diffuse light bounces to use for approximate ambient occlusion" @@ -4587,11 +4594,11 @@ #+ * 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.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" - + * WorldLighting.use_indirect_lighting -> use_indirect_light: boolean "Add indirect light bouncing of surrounding objects" +#+ * WorldLighting.use_ambient_occlusion -> use_ambient_occlusion: boolean "Use Ambient Occlusion to add shadowing based on distance between objects" +#WorldLighting.use_cache -> use_cache: boolean "Cache AO results in pixels and interpolate over neighbouring pixels for speedup (for Approximate)" +#WorldLighting.use_environment_light -> use_environment_light: boolean "Add light coming from the environment" +#WorldLighting.use_falloff -> use_falloff: boolean "NO DESCRIPTION" +#WorldLighting.use_indirect_light -> use_indirect_light: boolean "Add indirect light bouncing of surrounding objects" #+ * WorldMistSettings.depth -> depth: float "The distance over which the mist effect fades in" #+ * WorldMistSettings.falloff -> falloff: enum "Type of transition used to fade mist" #+ * WorldMistSettings.height -> height: float "Control how much mist density decreases with height" @@ -4599,7 +4606,7 @@ #+ * WorldMistSettings.start -> start: float "Starting distance of the mist, measured from the camera" #+ * WorldMistSettings.use_mist -> use_mist: boolean "Occlude objects with the environment color as they are further away" #+ * WorldStarsSettings.average_separation -> average_separation: float "Average distance between any two stars" - + * WorldStarsSettings.color_randomization -> color_random: float "Randomize star colors" - + * WorldStarsSettings.min_distance -> distance_min: float "Minimum distance to the camera for stars" +#WorldStarsSettings.color_random -> color_random: float "Randomize star colors" +#WorldStarsSettings.distance_min -> distance_min: float "Minimum distance to the camera for stars" #+ * WorldStarsSettings.size -> size: float "Average screen dimension of stars" -#+ * WorldStarsSettings.use_stars -> use_stars: boolean "Enable starfield generation[651155 refs]" +#+ * WorldStarsSettings.use_stars -> use_stars: boolean "Enable starfield generation" diff --git a/source/blender/makesrna/rna_cleanup/rna_update.sh b/source/blender/makesrna/rna_cleanup/rna_update.sh index 5dc70ad947d..04d4bbcb0e4 100755 --- a/source/blender/makesrna/rna_cleanup/rna_update.sh +++ b/source/blender/makesrna/rna_cleanup/rna_update.sh @@ -6,6 +6,8 @@ cd ./source/blender/makesrna/rna_cleanup/ ./rna_cleaner_merge.py out_work.py rna_properties_work.py ./rna_cleaner.py out_work_merged.py ./rna_cleaner.py out_work_lost.py -mv out_work_merged_work.txt rna_properties_new.txt +mv out_work_merged_work.txt rna_properties.txt # overwrite mv out_work_lost_work.txt rna_properties_lost.txt -echo "Updated: rna_properties_new.txt rna_properties_lost.txt" \ No newline at end of file +cat rna_properties.txt | grep -v "^#" > rna_properties_edits.txt +./rna_cleaner.py rna_properties.txt +echo "Updated: rna_properties.txt rna_properties_edits.txt rna_properties_lost.txt " \ No newline at end of file diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 1e521aea438..6d16896fb16 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -34,22 +34,15 @@ static void operator_properties_init(wmOperatorType *ot) { PyObject *py_class = ot->ext.data; - PyObject *item= ((PyTypeObject*)py_class)->tp_dict; /* getattr(..., "__dict__") returns a proxy */ - RNA_struct_blender_type_set(ot->ext.srna, ot); - if(item) { - /* only call this so pyrna_deferred_register_props gives a useful error - * WM_operatortype_append_ptr will call RNA_def_struct_identifier - * later */ - RNA_def_struct_identifier(ot->srna, ot->idname); + /* only call this so pyrna_deferred_register_class gives a useful error + * WM_operatortype_append_ptr will call RNA_def_struct_identifier + * later */ + RNA_def_struct_identifier(ot->srna, ot->idname); - if(pyrna_deferred_register_props(ot->srna, item) != 0) { - PyErr_Print(); /* failed to register operator props */ - PyErr_Clear(); - } - } - else { + if(pyrna_deferred_register_class(ot->srna, py_class) != 0) { + PyErr_Print(); /* failed to register operator props */ PyErr_Clear(); } } diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 05ccabe1641..fd3b59a97f7 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1663,12 +1663,12 @@ static int pyrna_struct_contains(BPy_StructRNA *self, PyObject *value) return -1; } - if(RNA_struct_idproperties_check(self->ptr.type)==0) { + if(RNA_struct_idprops_check(self->ptr.type)==0) { PyErr_SetString( PyExc_TypeError, "bpy_struct: this type doesnt support IDProperties"); return -1; } - group= RNA_struct_idproperties(&self->ptr, 0); + group= RNA_struct_idprops(&self->ptr, 0); if(!group) return 0; @@ -1721,7 +1721,7 @@ static PyObject *pyrna_struct_subscript( BPy_StructRNA *self, PyObject *key ) IDProperty *group, *idprop; char *name= _PyUnicode_AsString(key); - if(RNA_struct_idproperties_check(self->ptr.type)==0) { + if(RNA_struct_idprops_check(self->ptr.type)==0) { PyErr_SetString( PyExc_TypeError, "this type doesn't support IDProperties"); return NULL; } @@ -1731,7 +1731,7 @@ static PyObject *pyrna_struct_subscript( BPy_StructRNA *self, PyObject *key ) return NULL; } - group= RNA_struct_idproperties(&self->ptr, 0); + group= RNA_struct_idprops(&self->ptr, 0); if(group==NULL) { PyErr_Format( PyExc_KeyError, "bpy_struct[key]: key \"%s\" not found", name); @@ -1750,7 +1750,7 @@ static PyObject *pyrna_struct_subscript( BPy_StructRNA *self, PyObject *key ) static int pyrna_struct_ass_subscript( BPy_StructRNA *self, PyObject *key, PyObject *value ) { - IDProperty *group= RNA_struct_idproperties(&self->ptr, 1); + IDProperty *group= RNA_struct_idprops(&self->ptr, 1); if(group==NULL) { PyErr_SetString(PyExc_TypeError, "bpy_struct[key] = val: id properties not supported for this type"); @@ -1780,12 +1780,12 @@ static PyObject *pyrna_struct_keys(BPy_PropertyRNA *self) { IDProperty *group; - if(RNA_struct_idproperties_check(self->ptr.type)==0) { + if(RNA_struct_idprops_check(self->ptr.type)==0) { PyErr_SetString( PyExc_TypeError, "bpy_struct.keys(): this type doesn't support IDProperties"); return NULL; } - group= RNA_struct_idproperties(&self->ptr, 0); + group= RNA_struct_idprops(&self->ptr, 0); if(group==NULL) return PyList_New(0); @@ -1807,12 +1807,12 @@ static PyObject *pyrna_struct_items(BPy_PropertyRNA *self) { IDProperty *group; - if(RNA_struct_idproperties_check(self->ptr.type)==0) { + if(RNA_struct_idprops_check(self->ptr.type)==0) { PyErr_SetString( PyExc_TypeError, "bpy_struct.items(): this type doesn't support IDProperties"); return NULL; } - group= RNA_struct_idproperties(&self->ptr, 0); + group= RNA_struct_idprops(&self->ptr, 0); if(group==NULL) return PyList_New(0); @@ -1834,12 +1834,12 @@ static PyObject *pyrna_struct_values(BPy_PropertyRNA *self) { IDProperty *group; - if(RNA_struct_idproperties_check(self->ptr.type)==0) { + if(RNA_struct_idprops_check(self->ptr.type)==0) { PyErr_SetString( PyExc_TypeError, "bpy_struct.values(): this type doesn't support IDProperties"); return NULL; } - group= RNA_struct_idproperties(&self->ptr, 0); + group= RNA_struct_idprops(&self->ptr, 0); if(group==NULL) return PyList_New(0); @@ -2101,7 +2101,7 @@ static PyObject *pyrna_struct_is_property_set(BPy_StructRNA *self, PyObject *arg /* double property lookup, could speed up */ /* return PyBool_FromLong(RNA_property_is_set(&self->ptr, name)); */ if(RNA_property_flag(prop) & PROP_IDPROPERTY) { - IDProperty *group= RNA_struct_idproperties(&self->ptr, 0); + IDProperty *group= RNA_struct_idprops(&self->ptr, 0); if(group) { ret= IDP_GetPropertyFromGroup(group, name) ? 1:0; } @@ -2359,7 +2359,7 @@ static PyObject *pyrna_struct_getattro( BPy_StructRNA *self, PyObject *pyname ) if(name[0]=='_') { // rna can't start with a "_", so for __dict__ and similar we can skip using rna lookups /* annoying exception, maybe we need to have different types for this... */ - if((strcmp(name, "__getitem__")==0 || strcmp(name, "__setitem__")==0) && !RNA_struct_idproperties_check(self->ptr.type)) { + if((strcmp(name, "__getitem__")==0 || strcmp(name, "__setitem__")==0) && !RNA_struct_idprops_check(self->ptr.type)) { PyErr_SetString(PyExc_AttributeError, "bpy_struct: no __getitem__ support for this type"); ret = NULL; } @@ -2754,12 +2754,12 @@ static PyObject *pyrna_struct_get(BPy_StructRNA *self, PyObject *args) return NULL; /* mostly copied from BPy_IDGroup_Map_GetItem */ - if(RNA_struct_idproperties_check(self->ptr.type)==0) { + if(RNA_struct_idprops_check(self->ptr.type)==0) { PyErr_SetString( PyExc_TypeError, "this type doesn't support IDProperties"); return NULL; } - group= RNA_struct_idproperties(&self->ptr, 0); + group= RNA_struct_idprops(&self->ptr, 0); if(group) { idprop= IDP_GetPropertyFromGroup(group, key); @@ -4372,7 +4372,6 @@ static int deferred_register_prop(StructRNA *srna, PyObject *item, PyObject *key if(*_PyUnicode_AsString(key)=='_') { PyErr_Format(PyExc_ValueError, "bpy_struct \"%.200s\" registration error: %.200s could not register because the property starts with an '_'\n", RNA_struct_identifier(srna), _PyUnicode_AsString(key)); - Py_DECREF(dummy_args); return -1; } pyfunc = PyCapsule_GetPointer(py_func_ptr, NULL); @@ -4393,8 +4392,6 @@ static int deferred_register_prop(StructRNA *srna, PyObject *item, PyObject *key // PyLineSpit(); PyErr_Format(PyExc_ValueError, "bpy_struct \"%.200s\" registration error: %.200s could not register\n", RNA_struct_identifier(srna), _PyUnicode_AsString(key)); - - Py_DECREF(dummy_args); return -1; } } @@ -4411,7 +4408,7 @@ static int deferred_register_prop(StructRNA *srna, PyObject *item, PyObject *key return 0; } -int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict) +static int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict) { PyObject *item, *key; PyObject *order; @@ -4421,12 +4418,10 @@ int pyrna_deferred_register_props(StructRNA *srna, PyObject *class_dict) dummy_args = PyTuple_New(0); - order= PyDict_GetItemString(class_dict, "order"); - - if(order==NULL) - PyErr_Clear(); - - if(order && PyList_Check(order)) { + if( !PyDict_CheckExact(class_dict) && + (order= PyDict_GetItemString(class_dict, "order")) && + PyList_CheckExact(order) + ) { for(pos= 0; postp_bases); + int i, ret; + + /* first scan base classes for registerable properties */ + for(i=0; itp_bases, i); + + /* the rules for using these base classes are not clear, + * 'object' is ofcourse not worth looking into and + * existing subclasses of RNA would cause a lot more dictionary + * looping then is needed (SomeOperator would scan Operator.__dict__) + * which is harmless but not at all useful. + * + * So only scan base classes which are not subclasses if blender types. + * This best fits having 'mix-in' classes for operators and render engines. + * */ + if( py_superclass != &PyBaseObject_Type && + !PyObject_IsSubclass((PyObject *)py_superclass, (PyObject *)&pyrna_struct_Type) + ) { + ret= pyrna_deferred_register_class_recursive(srna, py_superclass); + + if(ret != 0) { + return ret; + } + } + } + + /* not register out own properties */ + return pyrna_deferred_register_props(srna, py_class->tp_dict); /* getattr(..., "__dict__") returns a proxy */ +} + +int pyrna_deferred_register_class(StructRNA *srna, PyObject *py_class) +{ + /* Panels and Menus dont need this + * save some time and skip the checks here */ + if(!RNA_struct_idprops_register_check(srna)) + return 0; + + return pyrna_deferred_register_class_recursive(srna, (PyTypeObject *)py_class); +} + /*-------------------- Type Registration ------------------------*/ static int rna_function_arg_count(FunctionRNA *func) @@ -4888,8 +4926,7 @@ static PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class) StructRegisterFunc reg; StructRNA *srna; StructRNA *srna_new; - PyObject *item; - const char *identifier= ""; + const char *identifier; if(PyDict_GetItemString(((PyTypeObject*)py_class)->tp_dict, "bl_rna")) { PyErr_SetString(PyExc_AttributeError, "bpy.types.register(...): already registered as a subclass."); @@ -4923,12 +4960,7 @@ static PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class) /* call the register callback with reports & identifier */ BKE_reports_init(&reports, RPT_STORE); - item= PyObject_GetAttrString(py_class, "__name__"); - - if(item) { - identifier= _PyUnicode_AsString(item); - Py_DECREF(item); /* no need to keep a ref, the class owns it */ - } + identifier= ((PyTypeObject*)py_class)->tp_name; srna_new= reg(C, &reports, py_class, identifier, bpy_class_validate, bpy_class_call, bpy_class_free); @@ -4952,15 +4984,8 @@ static PyObject *pyrna_basetype_register(PyObject *self, PyObject *py_class) * * item= PyObject_GetAttrString(py_class, "__dict__"); */ - item= ((PyTypeObject*)py_class)->tp_dict; - if(item) { - if(pyrna_deferred_register_props(srna_new, item)!=0) { - return NULL; - } - } - else { - PyErr_Clear(); - } + if(pyrna_deferred_register_class(srna_new, py_class)!=0) + return NULL; Py_RETURN_NONE; } diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h index bd9838a76d4..63f6997d82c 100644 --- a/source/blender/python/intern/bpy_rna.h +++ b/source/blender/python/intern/bpy_rna.h @@ -86,7 +86,7 @@ int pyrna_set_to_enum_bitfield(EnumPropertyItem *items, PyObject *value, int *r_ int pyrna_enum_value_from_id(EnumPropertyItem *item, const char *identifier, int *value, const char *error_prefix); -int pyrna_deferred_register_props(struct StructRNA *srna, PyObject *class_dict); +int pyrna_deferred_register_class(struct StructRNA *srna, PyObject *py_class); /* called before stopping python */ void pyrna_alloc_types(void); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 1df987e5626..e94f583d04c 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -37,7 +37,6 @@ #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" @@ -64,7 +63,6 @@ #include "BKE_scene.h" #include "BKE_screen.h" /* BKE_ST_MAXNAME */ #include "BKE_utildefines.h" -#include "BKE_brush.h" // JW #include "BKE_idcode.h" #include "BIF_gl.h" @@ -74,7 +72,6 @@ #include "ED_screen.h" #include "ED_util.h" -#include "ED_view3d.h" // JW #include "RNA_access.h" #include "RNA_define.h" @@ -92,8 +89,6 @@ #include "wm_subwindow.h" #include "wm_window.h" - - static ListBase global_ops= {NULL, NULL}; /* ************ operator API, exported ********** */ @@ -2585,33 +2580,22 @@ const int WM_RADIAL_CONTROL_DISPLAY_SIZE = 200; typedef struct wmRadialControl { int mode; float initial_value, value, max_value; + float col[4], tex_col[4]; int initial_mouse[2]; void *cursor; GLuint tex; } wmRadialControl; -extern Paint *paint_get_active(Scene *sce); -extern struct Brush *paint_brush(struct Paint *paint); - static void wm_radial_control_paint(bContext *C, int x, int y, void *customdata) { wmRadialControl *rc = (wmRadialControl*)customdata; ARegion *ar = CTX_wm_region(C); float r1=0.0f, r2=0.0f, r3=0.0f, angle=0.0f; - Paint *paint = paint_get_active(CTX_data_scene(C)); - struct Brush *brush = paint_brush(paint); - - ViewContext vc; - // int hit = 0; - - int flip; - int sign; - - float* col; - - const float str = rc->mode == WM_RADIALCONTROL_STRENGTH ? (rc->value + 0.5) : (brush->texture_overlay_alpha / 100.0f); + + if(rc->mode == WM_RADIALCONTROL_STRENGTH) + rc->tex_col[3]= (rc->value + 0.5); if(rc->mode == WM_RADIALCONTROL_SIZE) { r1= rc->value; @@ -2629,18 +2613,6 @@ static void wm_radial_control_paint(bContext *C, int x, int y, void *customdata) x = rc->initial_mouse[0] - ar->winrct.xmin; y = rc->initial_mouse[1] - ar->winrct.ymin; - view3d_set_viewcontext(C, &vc); - - // XXX: no way currently to know state of pen flip or invert key modifier without starting a stroke - flip = 1; - - sign = flip * ((brush->flag & BRUSH_DIR_IN)? -1 : 1); - - if (sign < 0 && ELEM4(brush->sculpt_tool, SCULPT_TOOL_DRAW, SCULPT_TOOL_INFLATE, SCULPT_TOOL_CLAY, SCULPT_TOOL_PINCH)) - col = brush->sub_col; - else - col = brush->add_col; - glTranslatef((float)x, (float)y, 0.0f); glEnable(GL_BLEND); @@ -2657,7 +2629,7 @@ static void wm_radial_control_paint(bContext *C, int x, int y, void *customdata) glEnable(GL_TEXTURE_2D); glBegin(GL_QUADS); - glColor4f(U.sculpt_paint_overlay_col[0],U.sculpt_paint_overlay_col[1],U.sculpt_paint_overlay_col[2], str); + glColor4f(rc->tex_col[0], rc->tex_col[1], rc->tex_col[2], rc->tex_col[3]); glTexCoord2f(0,0); glVertex2f(-r3, -r3); glTexCoord2f(1,0); @@ -2671,7 +2643,7 @@ static void wm_radial_control_paint(bContext *C, int x, int y, void *customdata) } if(rc->mode == WM_RADIALCONTROL_ANGLE) { - glColor4f(col[0], col[1], col[2], 0.5f); + glColor4f(rc->col[0], rc->col[1], rc->col[2], rc->col[3]); glEnable(GL_LINE_SMOOTH); glRotatef(-angle, 0, 0, 1); fdrawline(0, 0, WM_RADIAL_CONTROL_DISPLAY_SIZE, 0); @@ -2680,7 +2652,7 @@ static void wm_radial_control_paint(bContext *C, int x, int y, void *customdata) glDisable(GL_LINE_SMOOTH); } - glColor4f(col[0], col[1], col[2], 0.5f); + glColor4f(rc->col[0], rc->col[1], rc->col[2], rc->col[3]); glutil_draw_lined_arc(0.0, M_PI*2.0, r1, 40); glutil_draw_lined_arc(0.0, M_PI*2.0, r2, 40); glDisable(GL_BLEND); @@ -2806,6 +2778,9 @@ int WM_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event) MEM_freeN(im); } + RNA_float_get_array(op->ptr, "color", rc->col); + RNA_float_get_array(op->ptr, "texture_color", rc->tex_col); + RNA_int_set_array(op->ptr, "initial_mouse", mouse); RNA_float_set(op->ptr, "new_value", initial_value); @@ -2850,6 +2825,8 @@ void WM_OT_radial_control_partial(wmOperatorType *ot) {WM_RADIALCONTROL_STRENGTH, "STRENGTH", 0, "Strength", ""}, {WM_RADIALCONTROL_ANGLE, "ANGLE", 0, "Angle", ""}, {0, NULL, 0, NULL, NULL}}; + static float color[4] = {1.0f, 1.0f, 1.0f, 0.5f}; + static float tex_color[4] = {1.0f, 1.0f, 1.0f, 1.0f}; /* Should be set in custom invoke() */ RNA_def_float(ot->srna, "initial_value", 0, 0, FLT_MAX, "Initial Value", "", 0, FLT_MAX); @@ -2861,7 +2838,10 @@ void WM_OT_radial_control_partial(wmOperatorType *ot) RNA_def_enum(ot->srna, "mode", radial_mode_items, 0, "Mode", ""); /* Internal */ - RNA_def_int_vector(ot->srna, "initial_mouse", 2, NULL, INT_MIN, INT_MAX, "initial_mouse", "", INT_MIN, INT_MAX); + RNA_def_int_vector(ot->srna, "initial_mouse", 2, NULL, INT_MIN, INT_MAX, "Initial Mouse", "", INT_MIN, INT_MAX); + + RNA_def_float_color(ot->srna, "color", 4, color, 0.0f, FLT_MAX, "Color", "Radial control color", 0.0f, 1.0f); + RNA_def_float_color(ot->srna, "texture_color", 4, tex_color, 0.0f, FLT_MAX, "Texture Color", "Radial control texture color", 0.0f, 1.0f); } /* ************************** timer for testing ***************** */ 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