[Bf-blender-cvs] [10fad7c88db] simulation-access-modifier: add ifdefs
Jacques Lucke
noreply at git.blender.org
Mon May 4 12:29:37 CEST 2020
Commit: 10fad7c88db642277be784ba77941faa7abc5d9a
Author: Jacques Lucke
Date: Tue Apr 28 12:40:55 2020 +0200
Branches: simulation-access-modifier
https://developer.blender.org/rB10fad7c88db642277be784ba77941faa7abc5d9a
add ifdefs
===================================================================
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index e831599f4c2..c32a88b9918 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -289,11 +289,13 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
"Spawn particles from the shape"},
{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
{eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""},
+#ifdef WITH_NEW_SIMULATION_TYPE
{eModifierType_SimulationAccess,
"SIMULATION_ACCESS",
ICON_PHYSICS,
"Simulation Access",
""}, /* TODO: Use correct icon. */
+#endif
{0, NULL, 0, NULL, NULL},
};
@@ -6563,10 +6565,12 @@ static void rna_def_modifier_simulation_access(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "SimulationAccessModifierData");
RNA_def_struct_ui_icon(srna, ICON_PHYSICS); /* TODO: Use correct icon. */
+# ifdef WITH_NEW_SIMULATION_TYPE
prop = RNA_def_property(srna, "simulation", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Simulation", "Simulation to access");
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
+# endif
prop = RNA_def_property(srna, "data_path", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(
More information about the Bf-blender-cvs
mailing list