[Bf-blender-cvs] [52040433a14] functions: rename modifier
Jacques Lucke
noreply at git.blender.org
Tue Jul 9 18:01:38 CEST 2019
Commit: 52040433a14485afef1cc68026cdc2214aff9acc
Author: Jacques Lucke
Date: Tue Jul 9 13:48:00 2019 +0200
Branches: functions
https://developer.blender.org/rB52040433a14485afef1cc68026cdc2214aff9acc
rename modifier
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/MOD_modifiertypes.h
R081 source/blender/modifiers/intern/MOD_nodeparticles.c source/blender/modifiers/intern/MOD_bparticles.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/simulations/BParticles.h
M source/blender/simulations/bparticles/c_wrapper.cpp
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index d0e4bfdd4f7..53d3a8c451e 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1661,7 +1661,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
props.object_name = ob.name
props.modifier_name = md.name
- def NODE_PARTICLES(self, layout, ob, md):
+ def BPARTICLES(self, layout, ob, md):
layout.prop(md, "bparticles_tree")
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 72845b30ef1..6e8b8dadf19 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2017,7 +2017,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
case eModifierType_ShapeKey:
case eModifierType_FunctionDeform:
case eModifierType_FunctionPoints:
- case eModifierType_NodeParticles:
+ case eModifierType_BParticles:
case NUM_MODIFIER_TYPES:
data.icon = ICON_DOT;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index bfee921beed..3a6f0b60efc 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -90,7 +90,7 @@ typedef enum ModifierType {
eModifierType_WeightedNormal = 54,
eModifierType_FunctionDeform = 55,
eModifierType_FunctionPoints = 56,
- eModifierType_NodeParticles = 57,
+ eModifierType_BParticles = 57,
NUM_MODIFIER_TYPES
} ModifierType;
@@ -1963,9 +1963,9 @@ typedef struct FunctionPointsModifierData {
struct bNodeTree *function_tree;
} FunctionPointsModifierData;
-typedef struct NodeParticlesModifierData {
+typedef struct BParticlesModifierData {
ModifierData modifier;
struct bNodeTree *bparticles_tree;
-} NodeParticlesModifierData;
+} BParticlesModifierData;
#endif /* __DNA_MODIFIER_TYPES_H__ */
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 6a13072dac0..09c5c13af11 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -147,7 +147,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
{eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""},
- {eModifierType_NodeParticles, "NODE_PARTICLES", ICON_NONE, "Node Particles", ""},
+ {eModifierType_BParticles, "BPARTICLES", ICON_NONE, "BParticles", ""},
{0, NULL, 0, NULL, NULL},
};
@@ -580,8 +580,8 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr)
return &RNA_FunctionDeformModifier;
case eModifierType_FunctionPoints:
return &RNA_FunctionPointsModifier;
- case eModifierType_NodeParticles:
- return &RNA_NodeParticlesModifier;
+ case eModifierType_BParticles:
+ return &RNA_BParticlesModifier;
/* Default */
case eModifierType_None:
case eModifierType_ShapeKey:
@@ -5968,14 +5968,14 @@ static void rna_def_modifier_function_points(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
}
-static void rna_def_modifier_node_particles(BlenderRNA *brna)
+static void rna_def_modifier_bparticles(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
- srna = RNA_def_struct(brna, "NodeParticlesModifier", "Modifier");
+ srna = RNA_def_struct(brna, "BParticlesModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Node Particles Modifier", "");
- RNA_def_struct_sdna(srna, "NodeParticlesModifierData");
+ RNA_def_struct_sdna(srna, "BParticlesModifierData");
RNA_def_struct_ui_icon(srna, ICON_NONE);
prop = RNA_def_property(srna, "bparticles_tree", PROP_POINTER, PROP_NONE);
@@ -6111,7 +6111,7 @@ void RNA_def_modifier(BlenderRNA *brna)
rna_def_modifier_weightednormal(brna);
rna_def_modifier_function_deform(brna);
rna_def_modifier_function_points(brna);
- rna_def_modifier_node_particles(brna);
+ rna_def_modifier_bparticles(brna);
}
#endif
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index e6d4664865c..cdcc28a55bb 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -74,7 +74,7 @@ set(SRC
intern/MOD_meshsequencecache.c
intern/MOD_mirror.c
intern/MOD_multires.c
- intern/MOD_nodeparticles.c
+ intern/MOD_bparticles.c
intern/MOD_none.c
intern/MOD_normal_edit.c
intern/MOD_ocean.c
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h
index a9aaa2f69ec..58f70520b90 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -83,7 +83,7 @@ extern ModifierTypeInfo modifierType_SurfaceDeform;
extern ModifierTypeInfo modifierType_WeightedNormal;
extern ModifierTypeInfo modifierType_FunctionDeform;
extern ModifierTypeInfo modifierType_FunctionPoints;
-extern ModifierTypeInfo modifierType_NodeParticles;
+extern ModifierTypeInfo modifierType_BParticles;
/* MOD_util.c */
void modifier_type_init(ModifierTypeInfo *types[]);
diff --git a/source/blender/modifiers/intern/MOD_nodeparticles.c b/source/blender/modifiers/intern/MOD_bparticles.c
similarity index 81%
rename from source/blender/modifiers/intern/MOD_nodeparticles.c
rename to source/blender/modifiers/intern/MOD_bparticles.c
index 9ed2baa5025..17beb36111c 100644
--- a/source/blender/modifiers/intern/MOD_nodeparticles.c
+++ b/source/blender/modifiers/intern/MOD_bparticles.c
@@ -21,7 +21,7 @@
*
*/
-/** \file blender/modifiers/intern/MOD_nodeparticles.c
+/** \file blender/modifiers/intern/MOD_bparticles.c
* \ingroup modifiers
*
*/
@@ -54,17 +54,17 @@ typedef struct RuntimeData {
float last_simulated_frame;
} RuntimeData;
-static RuntimeData *get_runtime_struct(NodeParticlesModifierData *npmd)
+static RuntimeData *get_runtime_struct(BParticlesModifierData *bpmd)
{
- if (npmd->modifier.runtime == NULL) {
+ if (bpmd->modifier.runtime == NULL) {
RuntimeData *runtime = MEM_callocN(sizeof(RuntimeData), __func__);
runtime->particles_state = NULL;
runtime->world_state = NULL;
runtime->last_simulated_frame = 0.0f;
- npmd->modifier.runtime = runtime;
+ bpmd->modifier.runtime = runtime;
}
- return npmd->modifier.runtime;
+ return bpmd->modifier.runtime;
}
static void free_runtime_data(RuntimeData *runtime)
@@ -74,12 +74,12 @@ static void free_runtime_data(RuntimeData *runtime)
MEM_freeN(runtime);
}
-static void free_modifier_runtime_data(NodeParticlesModifierData *npmd)
+static void free_modifier_runtime_data(BParticlesModifierData *bpmd)
{
- RuntimeData *runtime = (RuntimeData *)npmd->modifier.runtime;
+ RuntimeData *runtime = (RuntimeData *)bpmd->modifier.runtime;
if (runtime != NULL) {
free_runtime_data(runtime);
- npmd->modifier.runtime = NULL;
+ bpmd->modifier.runtime = NULL;
}
}
@@ -103,8 +103,8 @@ static Mesh *applyModifier(ModifierData *md,
const struct ModifierEvalContext *ctx,
Mesh *UNUSED(mesh))
{
- NodeParticlesModifierData *npmd = (NodeParticlesModifierData *)md;
- RuntimeData *runtime = get_runtime_struct(npmd);
+ BParticlesModifierData *bpmd = (BParticlesModifierData *)md;
+ RuntimeData *runtime = get_runtime_struct(bpmd);
if (runtime->particles_state == NULL) {
runtime->particles_state = BParticles_new_empty_state();
@@ -119,12 +119,12 @@ static Mesh *applyModifier(ModifierData *md,
}
else if (current_frame == runtime->last_simulated_frame + 1.0f) {
BParticles_simulate_modifier(
- npmd, ctx->depsgraph, runtime->particles_state, runtime->world_state);
+ bpmd, ctx->depsgraph, runtime->particles_state, runtime->world_state);
runtime->last_simulated_frame = current_frame;
}
else {
- free_modifier_runtime_data(npmd);
- runtime = get_runtime_struct(npmd);
+ free_modifier_runtime_data(bpmd);
+ runtime = get_runtime_struct(bpmd);
runtime->particles_state = BParticles_new_empty_state();
runtime->world_state = BParticles_new_world_state();
runtime->last_simulated_frame = current_frame;
@@ -139,8 +139,8 @@ static void initData(ModifierData *UNUSED(md))
static void freeData(ModifierData *md)
{
- NodeParticlesModifierData *npmd = (NodeParticlesModifierData *)md;
- free_modifier_runtime_data(npmd);
+ BParticlesModifierData *bpmd = (BParticlesModifierData *)md;
+ free_modifier_runtime_data(bpmd);
}
static void freeRuntimeData(void *runtime_data_v)
@@ -171,16 +171,16 @@ static void foreachObjectLink(ModifierData *UNUSED(md),
static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
{
- NodeParticlesModifierData *npmd = (NodeParticlesModifierData *)md;
- walk(userData, ob, (ID **)&npmd->bparticles_tree, IDWALK_CB_NOP);
+ BParticlesModifierData *bpmd = (BParticlesModifierData *)md;
+ walk(userData, ob, (ID **)&bpmd->bparticles_tree, IDWALK_CB_NOP);
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
}
-ModifierTypeInfo modifierType_NodeParticles = {
- /* name */ "Node Particles",
- /* structName */ "NodeParticlesModifierData",
- /* structSize */ sizeof(NodeParticlesModifierData),
+ModifierTypeInfo modifierType_BParticles = {
+ /* name */ "BParticles",
+ /* structName */ "BParticlesModifierData",
+ /* structSize */ sizeof(BParticlesModifierData),
/* type */ eModifierTypeType_Constructive,
/* flags */ eModifierTypeFlag_AcceptsMesh,
/* copyData */ modifier_copyData_generic,
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index 3f4225da391..b4ceb349216 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifie
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list