diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_texture.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 169 |
1 files changed, 101 insertions, 68 deletions
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index e8253f4b51c..646f9846e58 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -51,7 +51,8 @@ EnumPropertyItem texture_filter_items[] = { {TXF_EWA, "EWA", 0, "EWA", ""}, {TXF_FELINE, "FELINE", 0, "FELINE", ""}, {TXF_AREA, "AREA", 0, "Area", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} +}; EnumPropertyItem texture_type_items[] = { {0, "NONE", 0, "None", ""}, @@ -74,7 +75,8 @@ EnumPropertyItem texture_type_items[] = { {TEX_VOXELDATA, "VOXEL_DATA", ICON_TEXTURE, "Voxel Data", "Create a 3d texture based on volumetric data"}, {TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", "Procedural - wave generated bands or rings, with optional noise"}, {TEX_OCEAN, "OCEAN", ICON_TEXTURE, "Ocean", "Use a texture generated by an Ocean modifier"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} +}; EnumPropertyItem blend_type_items[] = { {MTEX_BLEND, "MIX", 0, "Mix", ""}, @@ -93,7 +95,8 @@ EnumPropertyItem blend_type_items[] = { {MTEX_BLEND_COLOR, "COLOR", 0, "Color", ""}, {MTEX_SOFT_LIGHT, "SOFT_LIGHT", 0, "Soft Light", ""}, {MTEX_LIN_LIGHT, "LINEAR_LIGHT", 0, "Linear Light", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} +}; #ifdef RNA_RUNTIME @@ -113,7 +116,7 @@ EnumPropertyItem blend_type_items[] = { static StructRNA *rna_Texture_refine(struct PointerRNA *ptr) { - Tex *tex = (Tex*)ptr->data; + Tex *tex = (Tex *)ptr->data; switch (tex->type) { case TEX_BLEND: @@ -160,7 +163,7 @@ static void rna_Texture_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *pt DAG_id_tag_update(&tex->id, 0); WM_main_add_notifier(NC_TEXTURE, tex); - WM_main_add_notifier(NC_MATERIAL|ND_SHADING_DRAW, NULL); + WM_main_add_notifier(NC_MATERIAL | ND_SHADING_DRAW, NULL); } else if (GS(id->name) == ID_NT) { bNodeTree *ntree = ptr->id.data; @@ -205,12 +208,12 @@ static void rna_Texture_nodes_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Tex *tex = ptr->id.data; DAG_id_tag_update(&tex->id, 0); - WM_main_add_notifier(NC_TEXTURE|ND_NODES, tex); + WM_main_add_notifier(NC_TEXTURE | ND_NODES, tex); } static void rna_Texture_type_set(PointerRNA *ptr, int value) { - Tex *tex = (Tex*)ptr->data; + Tex *tex = (Tex *)ptr->data; tex_set_type(tex, value); } @@ -223,14 +226,14 @@ void rna_TextureSlot_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRN switch (GS(id->name)) { case ID_MA: - WM_main_add_notifier(NC_MATERIAL|ND_SHADING, id); - WM_main_add_notifier(NC_MATERIAL|ND_SHADING_DRAW, id); + WM_main_add_notifier(NC_MATERIAL | ND_SHADING, id); + WM_main_add_notifier(NC_MATERIAL | ND_SHADING_DRAW, id); break; case ID_WO: WM_main_add_notifier(NC_WORLD, id); break; case ID_LA: - WM_main_add_notifier(NC_LAMP|ND_LIGHTING, id); + WM_main_add_notifier(NC_LAMP | ND_LIGHTING, id); break; case ID_BR: WM_main_add_notifier(NC_BRUSH, id); @@ -246,7 +249,7 @@ void rna_TextureSlot_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRN recalc |= PSYS_RECALC_CHILD; DAG_id_tag_update(id, recalc); - WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL); + WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, NULL); break; } } @@ -279,7 +282,7 @@ char *rna_TextureSlot_path(PointerRNA *ptr) /* this is a compromise for the remaining cases... */ if (mtex->tex) - return BLI_sprintfN("texture_slots[\"%s\"]", mtex->tex->id.name+2); + return BLI_sprintfN("texture_slots[\"%s\"]", mtex->tex->id.name + 2); else return BLI_strdup("texture_slots[0]"); } @@ -289,7 +292,7 @@ static int rna_TextureSlot_name_length(PointerRNA *ptr) MTex *mtex = ptr->data; if (mtex->tex) - return strlen(mtex->tex->id.name+2); + return strlen(mtex->tex->id.name + 2); return 0; } @@ -299,7 +302,7 @@ static void rna_TextureSlot_name_get(PointerRNA *ptr, char *str) MTex *mtex = ptr->data; if (mtex->tex) - strcpy(str, mtex->tex->id.name+2); + strcpy(str, mtex->tex->id.name + 2); else str[0] = '\0'; } @@ -350,7 +353,7 @@ static EnumPropertyItem *rna_TextureSlot_output_node_itemf(bContext *C, PointerR for (node = ntree->nodes.first; node; node = node->next) { if (node->type == TEX_NODE_OUTPUT) { tmp.value = node->custom1; - tmp.name = ((TexNodeOutput*)node->storage)->name; + tmp.name = ((TexNodeOutput *)node->storage)->name; tmp.identifier = tmp.name; RNA_enum_item_add(&item, &totitem, &tmp); } @@ -366,7 +369,7 @@ static EnumPropertyItem *rna_TextureSlot_output_node_itemf(bContext *C, PointerR static void rna_Texture_use_color_ramp_set(PointerRNA *ptr, int value) { - Tex *tex = (Tex*)ptr->data; + Tex *tex = (Tex *)ptr->data; if (value) tex->flag |= TEX_COLORBAND; else tex->flag &= ~TEX_COLORBAND; @@ -377,7 +380,7 @@ static void rna_Texture_use_color_ramp_set(PointerRNA *ptr, int value) static void rna_Texture_use_nodes_set(PointerRNA *ptr, int v) { - Tex *tex = (Tex*)ptr->data; + Tex *tex = (Tex *)ptr->data; tex->use_nodes = v; tex->type = 0; @@ -388,7 +391,7 @@ static void rna_Texture_use_nodes_set(PointerRNA *ptr, int v) static void rna_ImageTexture_mipmap_set(PointerRNA *ptr, int value) { - Tex *tex = (Tex*)ptr->data; + Tex *tex = (Tex *)ptr->data; if (value) tex->imaflag |= TEX_MIPMAP; else tex->imaflag &= ~TEX_MIPMAP; @@ -412,7 +415,7 @@ static PointerRNA rna_PointDensity_psys_get(PointerRNA *ptr) PointerRNA value; if (ob && pd->psys) - psys = BLI_findlink(&ob->particlesystem, pd->psys-1); + psys = BLI_findlink(&ob->particlesystem, pd->psys - 1); RNA_pointer_create(&ob->id, &RNA_ParticleSystem, psys, &value); return value; @@ -451,14 +454,16 @@ static void rna_def_texmapping(BlenderRNA *brna) {MTEX_CUBE, "CUBE", 0, "Cube", "Map using the normal vector"}, {MTEX_TUBE, "TUBE", 0, "Tube", "Map with Z as central axis"}, {MTEX_SPHERE, "SPHERE", 0, "Sphere", "Map with Z as central axis"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem prop_xyz_mapping_items[] = { {0, "NONE", 0, "None", ""}, {1, "X", 0, "X", ""}, {2, "Y", 0, "Y", ""}, {3, "Z", 0, "Z", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; StructRNA *srna; PropertyRNA *prop; @@ -472,7 +477,7 @@ static void rna_def_texmapping(BlenderRNA *brna) RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT); RNA_def_property_update(prop, 0, "rna_Texture_mapping_update"); - /* Not PROP_XYZ, this is now in radians, no more degrees */ + /* Not PROP_XYZ, this is now in radians, no more degrees */ prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_EULER); RNA_def_property_float_sdna(prop, NULL, "rot"); RNA_def_property_ui_text(prop, "Rotation", ""); @@ -584,7 +589,8 @@ static void rna_def_mtex(BlenderRNA *brna) static EnumPropertyItem output_node_items[] = { {0, "DUMMY", 0, "Dummy", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "TextureSlot", NULL); RNA_def_struct_sdna(srna, "MTex"); @@ -721,12 +727,14 @@ static void rna_def_environment_map(BlenderRNA *brna) {ENV_STATIC, "STATIC", 0, "Static", "Calculate environment map only once"}, {ENV_ANIM, "ANIMATED", 0, "Animated", "Calculate environment map at each rendering"}, {ENV_LOAD, "IMAGE_FILE", 0, "Image File", "Load a saved environment map image from disk"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem prop_mapping_items[] = { {ENV_CUBE, "CUBE", 0, "Cube", "Use environment map with six cube sides"}, {ENV_PLANE, "PLANE", 0, "Plane", "Only one side is rendered, with Z axis pointing in direction of image"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "EnvironmentMap", NULL); RNA_def_struct_sdna(srna, "EnvMap"); @@ -818,12 +826,14 @@ static EnumPropertyItem prop_noise_basis_items[] = { "Noise algorithm - Voronoi Crackle: Voronoi tessellation with sharp edges"}, {TEX_CELLNOISE, "CELL_NOISE", 0, "Cell Noise", "Noise algorithm - Cell Noise: Square cell tessellation"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} +}; static EnumPropertyItem prop_noise_type[] = { {TEX_NOISESOFT, "SOFT_NOISE", 0, "Soft", "Generate soft noise (smooth transitions)"}, {TEX_NOISEPERL, "HARD_NOISE", 0, "Hard", "Generate hard noise (sharp transitions)"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} +}; static void rna_def_texture_clouds(BlenderRNA *brna) @@ -832,9 +842,10 @@ static void rna_def_texture_clouds(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_clouds_stype[] = { - {TEX_DEFAULT, "GREYSCALE", 0, "Greyscale", ""}, - {TEX_COLOR, "COLOR", 0, "Color", ""}, - {0, NULL, 0, NULL, NULL}}; + {TEX_DEFAULT, "GREYSCALE", 0, "Greyscale", ""}, + {TEX_COLOR, "COLOR", 0, "Color", ""}, + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "CloudsTexture", "Texture"); RNA_def_struct_ui_text(srna, "Clouds Texture", "Procedural noise texture"); @@ -885,17 +896,19 @@ static void rna_def_texture_wood(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_wood_stype[] = { - {TEX_BAND, "BANDS", 0, "Bands", "Use standard wood texture in bands"}, - {TEX_RING, "RINGS", 0, "Rings", "Use wood texture in rings"}, - {TEX_BANDNOISE, "BANDNOISE", 0, "Band Noise", "Add noise to standard wood"}, - {TEX_RINGNOISE, "RINGNOISE", 0, "Ring Noise", "Add noise to rings"}, - {0, NULL, 0, NULL, NULL}}; + {TEX_BAND, "BANDS", 0, "Bands", "Use standard wood texture in bands"}, + {TEX_RING, "RINGS", 0, "Rings", "Use wood texture in rings"}, + {TEX_BANDNOISE, "BANDNOISE", 0, "Band Noise", "Add noise to standard wood"}, + {TEX_RINGNOISE, "RINGNOISE", 0, "Ring Noise", "Add noise to rings"}, + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem prop_wood_noisebasis2[] = { - {TEX_SIN, "SIN", 0, "Sine", "Use a sine wave to produce bands"}, - {TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"}, - {TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"}, - {0, NULL, 0, NULL, NULL}}; + {TEX_SIN, "SIN", 0, "Sine", "Use a sine wave to produce bands"}, + {TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"}, + {TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"}, + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "WoodTexture", "Texture"); RNA_def_struct_ui_text(srna, "Wood Texture", "Procedural noise texture"); @@ -953,16 +966,18 @@ static void rna_def_texture_marble(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_marble_stype[] = { - {TEX_SOFT, "SOFT", 0, "Soft", "Use soft marble"}, - {TEX_SHARP, "SHARP", 0, "Sharp", "Use more clearly defined marble"}, - {TEX_SHARPER, "SHARPER", 0, "Sharper", "Use very clearly defined marble"}, - {0, NULL, 0, NULL, NULL}}; + {TEX_SOFT, "SOFT", 0, "Soft", "Use soft marble"}, + {TEX_SHARP, "SHARP", 0, "Sharp", "Use more clearly defined marble"}, + {TEX_SHARPER, "SHARPER", 0, "Sharper", "Use very clearly defined marble"}, + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem prop_marble_noisebasis2[] = { - {TEX_SIN, "SIN", 0, "Sin", "Use a sine wave to produce bands"}, - {TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"}, - {TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"}, - {0, NULL, 0, NULL, NULL}}; + {TEX_SIN, "SIN", 0, "Sin", "Use a sine wave to produce bands"}, + {TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"}, + {TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"}, + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "MarbleTexture", "Texture"); RNA_def_struct_ui_text(srna, "Marble Texture", "Procedural noise texture"); @@ -1059,12 +1074,14 @@ static void rna_def_texture_blend(BlenderRNA *brna) {TEX_HALO, "QUADRATIC_SPHERE", 0, "Quadratic sphere", "Create a quadratic progression in the shape of a sphere"}, {TEX_RAD, "RADIAL", 0, "Radial", "Create a radial progression"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static const EnumPropertyItem prop_flip_axis_items[] = { {0, "HORIZONTAL", 0, "Horizontal", "No flipping"}, {TEX_FLIPBLEND, "VERTICAL", 0, "Vertical", "Flip the texture's X and Y axis"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "BlendTexture", "Texture"); RNA_def_struct_ui_text(srna, "Blend Texture", "Procedural color blending texture"); @@ -1090,10 +1107,11 @@ static void rna_def_texture_stucci(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem prop_stucci_stype[] = { - {TEX_PLASTIC, "PLASTIC", 0, "Plastic", "Use standard stucci"}, - {TEX_WALLIN, "WALL_IN", 0, "Wall in", "Create Dimples"}, - {TEX_WALLOUT, "WALL_OUT", 0, "Wall out", "Create Ridges"}, - {0, NULL, 0, NULL, NULL}}; + {TEX_PLASTIC, "PLASTIC", 0, "Plastic", "Use standard stucci"}, + {TEX_WALLIN, "WALL_IN", 0, "Wall in", "Create Dimples"}, + {TEX_WALLOUT, "WALL_OUT", 0, "Wall out", "Create Ridges"}, + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "StucciTexture", "Texture"); RNA_def_struct_ui_text(srna, "Stucci Texture", "Procedural noise texture"); @@ -1153,7 +1171,8 @@ static void rna_def_texture_image(BlenderRNA *brna) "Clip to cubic-shaped area around the image and set exterior pixels as transparent"}, {TEX_REPEAT, "REPEAT", 0, "Repeat", "Cause the image to repeat horizontally and vertically"}, {TEX_CHECKER, "CHECKER", 0, "Checker", "Cause the image to repeat in checker board pattern"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "ImageTexture", "Texture"); RNA_def_struct_ui_text(srna, "Image Texture", ""); @@ -1344,7 +1363,8 @@ static void rna_def_texture_musgrave(BlenderRNA *brna) "Use Perlin noise as a basis, with extended controls"}, {TEX_FBM, "FBM", 0, "fBM", "Fractal Brownian Motion, use Brownian noise as a basis"}, {TEX_HTERRAIN, "HETERO_TERRAIN", 0, "Hetero Terrain", "Similar to multifractal"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "MusgraveTexture", "Texture"); RNA_def_struct_ui_text(srna, "Musgrave", "Procedural musgrave texture"); @@ -1431,7 +1451,8 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) {TEX_MINKOVSKY, "MINKOVSKY", 0, "Minkovsky", "Use the Minkowsky function to calculate distance " "(exponent value determines the shape of the boundaries)"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem prop_coloring_items[] = { /* XXX: OK names / descriptions? */ @@ -1440,7 +1461,8 @@ static void rna_def_texture_voronoi(BlenderRNA *brna) {TEX_COL2, "POSITION_OUTLINE", 0, "Position and Outline", "Use position plus an outline based on F2-F1"}, {TEX_COL3, "POSITION_OUTLINE_INTENSITY", 0, "Position, Outline, and Intensity", "Multiply position and outline by intensity"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "VoronoiTexture", "Texture"); RNA_def_struct_ui_text(srna, "Voronoi", "Procedural voronoi texture"); @@ -1559,19 +1581,22 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) {TEX_PD_PSYS, "PARTICLE_SYSTEM", 0, "Particle System", "Generate point density from a particle system"}, {TEX_PD_OBJECT, "OBJECT", 0, "Object Vertices", "Generate point density from an object's vertices"}, /*{TEX_PD_FILE, "FILE", 0, "File", ""}, */ - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem particle_cache_items[] = { {TEX_PD_OBJECTLOC, "OBJECT_LOCATION", 0, "Emit Object Location", ""}, {TEX_PD_OBJECTSPACE, "OBJECT_SPACE", 0, "Emit Object Space", ""}, {TEX_PD_WORLDSPACE, "WORLD_SPACE", 0, "Global Space", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem vertice_cache_items[] = { {TEX_PD_OBJECTLOC, "OBJECT_LOCATION", 0, "Object Location", ""}, {TEX_PD_OBJECTSPACE, "OBJECT_SPACE", 0, "Object Space", ""}, {TEX_PD_WORLDSPACE, "WORLD_SPACE", 0, "Global Space", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem falloff_items[] = { {TEX_PD_FALLOFF_STD, "STANDARD", 0, "Standard", ""}, @@ -1581,7 +1606,8 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) {TEX_PD_FALLOFF_ROOT, "ROOT", 0, "Root", ""}, {TEX_PD_FALLOFF_PARTICLE_AGE, "PARTICLE_AGE", 0, "Particle Age", ""}, {TEX_PD_FALLOFF_PARTICLE_VEL, "PARTICLE_VELOCITY", 0, "Particle Velocity", ""}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem color_source_items[] = { {TEX_PD_COLOR_CONSTANT, "CONSTANT", 0, "Constant", ""}, @@ -1589,7 +1615,8 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) {TEX_PD_COLOR_PARTSPEED, "PARTICLE_SPEED", 0, "Particle Speed", "Particle speed (absolute magnitude of velocity) mapped as 0.0-1.0 intensity"}, {TEX_PD_COLOR_PARTVEL, "PARTICLE_VELOCITY", 0, "Particle Velocity", "XYZ velocity mapped to RGB colors"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem turbulence_influence_items[] = { {TEX_PD_NOISE_STATIC, "STATIC", 0, "Static", @@ -1599,7 +1626,8 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) {TEX_PD_NOISE_AGE, "PARTICLE_AGE", 0, "Particle Age", "Turbulent noise driven by the particle's age between birth and death"}, {TEX_PD_NOISE_TIME, "GLOBAL_TIME", 0, "Global Time", "Turbulent noise driven by the global current frame"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "PointDensity", NULL); RNA_def_struct_sdna(srna, "PointDensity"); @@ -1751,7 +1779,8 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) {TEX_VD_TRICUBIC_CATROM, "TRICUBIC_CATROM", 0, "Cubic Catmull-Rom", "High quality interpolation, but slower"}, {TEX_VD_TRICUBIC_BSPLINE, "TRICUBIC_BSPLINE", 0, "Cubic B-Spline", "Smoothed high quality interpolation, but slower"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem file_format_items[] = { {TEX_VD_BLENDERVOXEL, "BLENDER_VOXEL", 0, "Blender Voxel", "Default binary voxel file format"}, @@ -1760,19 +1789,22 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) {TEX_VD_IMAGE_SEQUENCE, "IMAGE_SEQUENCE", 0, "Image Sequence", "Generate voxels from a sequence of image slices"}, {TEX_VD_SMOKE, "SMOKE", 0, "Smoke", "Render voxels from a Blender smoke simulation"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem voxeldata_extension[] = { {TEX_EXTEND, "EXTEND", 0, "Extend", "Extend by repeating edge pixels of the image"}, {TEX_CLIP, "CLIP", 0, "Clip", "Clip to image size and set exterior pixels as transparent"}, {TEX_REPEAT, "REPEAT", 0, "Repeat", "Cause the image to repeat horizontally and vertically"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; static EnumPropertyItem smoked_type_items[] = { {TEX_VD_SMOKEDENSITY, "SMOKEDENSITY", 0, "Density", "Use smoke density as texture data"}, {TEX_VD_SMOKEHEAT, "SMOKEHEAT", 0, "Heat", "Use smoke heat as texture data. Values from -2.0 to 2.0 are used"}, {TEX_VD_SMOKEVEL, "SMOKEVEL", 0, "Velocity", "Use smoke velocity as texture data"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "VoxelData", NULL); RNA_def_struct_sdna(srna, "VoxelData"); @@ -1874,7 +1906,8 @@ static void rna_def_texture_ocean(BlenderRNA *brna) {TEX_OCN_JPLUS, "JPLUS", 0, "Eigenvalues", "Positive Eigenvalues"}, {TEX_OCN_EMINUS, "EMINUS", 0, "Eigenvectors (-)", "Negative Eigenvectors"}, {TEX_OCN_EPLUS, "EPLUS", 0, "Eigenvectors (+)", "Positive Eigenvectors"}, - {0, NULL, 0, NULL, NULL}}; + {0, NULL, 0, NULL, NULL} + }; srna = RNA_def_struct(brna, "OceanTexData", NULL); RNA_def_struct_sdna(srna, "OceanTex"); |