OLD | NEW |
1 /* | 1 /* |
2 * $Id$ | 2 * $Id$ |
3 * | 3 * |
4 * ***** BEGIN GPL LICENSE BLOCK ***** | 4 * ***** BEGIN GPL LICENSE BLOCK ***** |
5 * | 5 * |
6 * This program is free software; you can redistribute it and/or | 6 * This program is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU General Public License | 7 * modify it under the terms of the GNU General Public License |
8 * as published by the Free Software Foundation; either version 2 | 8 * as published by the Free Software Foundation; either version 2 |
9 * of the License, or (at your option) any later version. | 9 * of the License, or (at your option) any later version. |
10 * | 10 * |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwra
p", ""}, | 84 {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwra
p", ""}, |
85 {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Si
mple Deform", ""}, | 85 {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Si
mple Deform", ""}, |
86 {eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""}, | 86 {eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""}, |
87 {eModifierType_Warp, "WARP", ICON_MOD_SUBSURF, "Warp", ""}, | 87 {eModifierType_Warp, "WARP", ICON_MOD_SUBSURF, "Warp", ""}, |
88 {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""}, | 88 {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""}, |
89 {0, "", 0, "Simulate", ""}, | 89 {0, "", 0, "Simulate", ""}, |
90 {eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""}, | 90 {eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""}, |
91 {eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""
}, | 91 {eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""
}, |
92 {eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""}, | 92 {eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""}, |
93 {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid S
imulation", ""}, | 93 {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid S
imulation", ""}, |
94 {eModifierType_NavMesh, "NAVMESH", ICON_MOD_PHYSICS, "Navigation mesh",
""}, | |
95 {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES
, "Particle Instance", ""}, | 94 {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES
, "Particle Instance", ""}, |
96 {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "P
article System", ""}, | 95 {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "P
article System", ""}, |
97 {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, | 96 {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, |
98 {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, | 97 {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, |
99 {eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""}, | 98 {eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""}, |
100 {0, NULL, 0, NULL, NULL}}; | 99 {0, NULL, 0, NULL, NULL}}; |
101 | 100 |
102 #ifdef RNA_RUNTIME | 101 #ifdef RNA_RUNTIME |
103 | 102 |
104 #include "DNA_particle_types.h" | 103 #include "DNA_particle_types.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 case eModifierType_Surface: | 181 case eModifierType_Surface: |
183 return &RNA_SurfaceModifier; | 182 return &RNA_SurfaceModifier; |
184 case eModifierType_Smoke: | 183 case eModifierType_Smoke: |
185 return &RNA_SmokeModifier; | 184 return &RNA_SmokeModifier; |
186 case eModifierType_Solidify: | 185 case eModifierType_Solidify: |
187 return &RNA_SolidifyModifier; | 186 return &RNA_SolidifyModifier; |
188 case eModifierType_Screw: | 187 case eModifierType_Screw: |
189 return &RNA_ScrewModifier; | 188 return &RNA_ScrewModifier; |
190 case eModifierType_Warp: | 189 case eModifierType_Warp: |
191 return &RNA_WarpModifier; | 190 return &RNA_WarpModifier; |
192 case eModifierType_NavMesh: | |
193 return &RNA_NavMeshModifier; | |
194 case eModifierType_WeightVGEdit: | 191 case eModifierType_WeightVGEdit: |
195 return &RNA_VertexWeightEditModifier; | 192 return &RNA_VertexWeightEditModifier; |
196 case eModifierType_WeightVGMix: | 193 case eModifierType_WeightVGMix: |
197 return &RNA_VertexWeightMixModifier; | 194 return &RNA_VertexWeightMixModifier; |
198 case eModifierType_WeightVGProximity: | 195 case eModifierType_WeightVGProximity: |
199 return &RNA_VertexWeightProximityModifier; | 196 return &RNA_VertexWeightProximityModifier; |
200 default: | 197 default: |
201 return &RNA_Modifier; | 198 return &RNA_Modifier; |
202 } | 199 } |
203 } | 200 } |
(...skipping 2279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2483 RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_OFFSE
T); | 2480 RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_OFFSE
T); |
2484 RNA_def_property_ui_text(prop, "Object Screw", "Use the distance between
the objects to make a screw"); | 2481 RNA_def_property_ui_text(prop, "Object Screw", "Use the distance between
the objects to make a screw"); |
2485 RNA_def_property_update(prop, 0, "rna_Modifier_update"); | 2482 RNA_def_property_update(prop, 0, "rna_Modifier_update"); |
2486 | 2483 |
2487 /*prop= RNA_def_property(srna, "use_angle_object", PROP_BOOLEAN, PROP_NO
NE); | 2484 /*prop= RNA_def_property(srna, "use_angle_object", PROP_BOOLEAN, PROP_NO
NE); |
2488 RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_ANGLE
); | 2485 RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SCREW_OBJECT_ANGLE
); |
2489 RNA_def_property_ui_text(prop, "Object Angle", "Use the angle between th
e objects rather than the fixed angle"); | 2486 RNA_def_property_ui_text(prop, "Object Angle", "Use the angle between th
e objects rather than the fixed angle"); |
2490 RNA_def_property_update(prop, 0, "rna_Modifier_update");*/ | 2487 RNA_def_property_update(prop, 0, "rna_Modifier_update");*/ |
2491 } | 2488 } |
2492 | 2489 |
2493 static void rna_def_modifier_navmesh(BlenderRNA *brna) | |
2494 { | |
2495 StructRNA *srna; | |
2496 /* PropertyRNA *prop; */ /* UNUSED */ | |
2497 | |
2498 srna= RNA_def_struct(brna, "NavMeshModifier", "Modifier"); | |
2499 RNA_def_struct_ui_text(srna, "NavMesh Modifier", "NavMesh modifier"); | |
2500 RNA_def_struct_sdna(srna, "NavMeshModifierData"); | |
2501 RNA_def_struct_ui_icon(srna, ICON_MOD_DECIM); | |
2502 } | |
2503 | |
2504 static void rna_def_modifier_weightvg_mask(BlenderRNA *brna, StructRNA *srna) | 2490 static void rna_def_modifier_weightvg_mask(BlenderRNA *brna, StructRNA *srna) |
2505 { | 2491 { |
2506 static EnumPropertyItem weightvg_mask_tex_map_items[] = { | 2492 static EnumPropertyItem weightvg_mask_tex_map_items[] = { |
2507 {MOD_DISP_MAP_LOCAL, "LOCAL", 0, "Local", ""}, | 2493 {MOD_DISP_MAP_LOCAL, "LOCAL", 0, "Local", ""}, |
2508 {MOD_DISP_MAP_GLOBAL, "GLOBAL", 0, "Global", ""}, | 2494 {MOD_DISP_MAP_GLOBAL, "GLOBAL", 0, "Global", ""}, |
2509 {MOD_DISP_MAP_OBJECT, "OBJECT", 0, "Object", ""}, | 2495 {MOD_DISP_MAP_OBJECT, "OBJECT", 0, "Object", ""}, |
2510 {MOD_DISP_MAP_UV, "UV", 0, "UV", ""}, | 2496 {MOD_DISP_MAP_UV, "UV", 0, "UV", ""}, |
2511 {0, NULL, 0, NULL, NULL}}; | 2497 {0, NULL, 0, NULL, NULL}}; |
2512 | 2498 |
2513 static EnumPropertyItem weightvg_mask_tex_used_items[] = { | 2499 static EnumPropertyItem weightvg_mask_tex_used_items[] = { |
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2886 rna_def_modifier_shrinkwrap(brna); | 2872 rna_def_modifier_shrinkwrap(brna); |
2887 rna_def_modifier_fluidsim(brna); | 2873 rna_def_modifier_fluidsim(brna); |
2888 rna_def_modifier_mask(brna); | 2874 rna_def_modifier_mask(brna); |
2889 rna_def_modifier_simpledeform(brna); | 2875 rna_def_modifier_simpledeform(brna); |
2890 rna_def_modifier_warp(brna); | 2876 rna_def_modifier_warp(brna); |
2891 rna_def_modifier_multires(brna); | 2877 rna_def_modifier_multires(brna); |
2892 rna_def_modifier_surface(brna); | 2878 rna_def_modifier_surface(brna); |
2893 rna_def_modifier_smoke(brna); | 2879 rna_def_modifier_smoke(brna); |
2894 rna_def_modifier_solidify(brna); | 2880 rna_def_modifier_solidify(brna); |
2895 rna_def_modifier_screw(brna); | 2881 rna_def_modifier_screw(brna); |
2896 rna_def_modifier_navmesh(brna); | |
2897 rna_def_modifier_weightvgedit(brna); | 2882 rna_def_modifier_weightvgedit(brna); |
2898 rna_def_modifier_weightvgmix(brna); | 2883 rna_def_modifier_weightvgmix(brna); |
2899 rna_def_modifier_weightvgproximity(brna); | 2884 rna_def_modifier_weightvgproximity(brna); |
2900 } | 2885 } |
2901 | 2886 |
2902 #endif | 2887 #endif |
OLD | NEW |