[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18153] branches/blender2.5/blender/source /blender: RNA
Brecht Van Lommel
brecht at blender.org
Mon Dec 29 18:36:06 CET 2008
Revision: 18153
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18153
Author: blendix
Date: 2008-12-29 18:36:06 +0100 (Mon, 29 Dec 2008)
Log Message:
-----------
RNA
* DNA_object_fluidsim.h: done, patch by Nathaniel Garbutt, thanks!
Some changes to make it more complete and adding inheritance to
better hide irrelevant and reused properties.
* Also added all derived types for modifiers, but only fluid is
filled in currently.
* Some files converted from DOS to UNIX line endings.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesdna/DNA_object_fluidsim.h
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_object_fluidsim.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_object_fluidsim.h 2008-12-29 16:36:58 UTC (rev 18152)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_object_fluidsim.h 2008-12-29 17:36:06 UTC (rev 18153)
@@ -157,6 +157,7 @@
#define OB_FSPART_DROP (1<<2)
#define OB_FSPART_NEWPART (1<<3)
#define OB_FSPART_FLOAT (1<<4)
+#define OB_FSPART_TRACER (1<<5)
// new fluid bit flags for fss->flags - dg
#define OB_FLUIDSIM_REVERSE (1 << 0)
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-29 16:36:58 UTC (rev 18152)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-29 17:36:06 UTC (rev 18153)
@@ -40,27 +40,45 @@
extern StructRNA RNA_AlwaysSensor;
extern StructRNA RNA_AndController;
extern StructRNA RNA_Armature;
+extern StructRNA RNA_ArmatureModifier;
+extern StructRNA RNA_ArrayModifier;
+extern StructRNA RNA_BevelModifier;
extern StructRNA RNA_BlenderRNA;
extern StructRNA RNA_Bone;
+extern StructRNA RNA_BooleanModifier;
extern StructRNA RNA_BooleanProperty;
extern StructRNA RNA_Brush;
+extern StructRNA RNA_BuildModifier;
extern StructRNA RNA_Camera;
+extern StructRNA RNA_CastModifier;
extern StructRNA RNA_CharInfo;
+extern StructRNA RNA_ClothModifier;
extern StructRNA RNA_CollectionProperty;
+extern StructRNA RNA_CollisionModifier;
extern StructRNA RNA_CollisionSensor;
extern StructRNA RNA_ColorSequence;
extern StructRNA RNA_Constraint;
+extern StructRNA RNA_ControlFluidSettings;
extern StructRNA RNA_Controller;
extern StructRNA RNA_Curve;
extern StructRNA RNA_CurveMap;
extern StructRNA RNA_CurveMapPoint;
extern StructRNA RNA_CurveMapping;
+extern StructRNA RNA_CurveModifier;
+extern StructRNA RNA_DecimateModifier;
extern StructRNA RNA_DelaySensor;
+extern StructRNA RNA_DisplaceModifier;
+extern StructRNA RNA_DomainFluidSettings;
+extern StructRNA RNA_EdgeSplitModifier;
extern StructRNA RNA_EffectSequence;
extern StructRNA RNA_EnumProperty;
extern StructRNA RNA_EnumPropertyItem;
+extern StructRNA RNA_ExplodeModifier;
extern StructRNA RNA_ExpressionController;
extern StructRNA RNA_FloatProperty;
+extern StructRNA RNA_FluidFluidSettings;
+extern StructRNA RNA_FluidSettings;
+extern StructRNA RNA_FluidSimulationModifier;
extern StructRNA RNA_GameBooleanProperty;
extern StructRNA RNA_GameFloatProperty;
extern StructRNA RNA_GameIntProperty;
@@ -69,12 +87,14 @@
extern StructRNA RNA_GameTimeProperty;
extern StructRNA RNA_GlowSequence;
extern StructRNA RNA_Group;
+extern StructRNA RNA_HookModifier;
extern StructRNA RNA_ID;
extern StructRNA RNA_IDProperty;
extern StructRNA RNA_IDPropertyGroup;
extern StructRNA RNA_Image;
extern StructRNA RNA_ImageSequence;
extern StructRNA RNA_ImageUser;
+extern StructRNA RNA_InflowFluidSettings;
extern StructRNA RNA_IntProperty;
extern StructRNA RNA_Ipo;
extern StructRNA RNA_IpoCurve;
@@ -84,6 +104,7 @@
extern StructRNA RNA_KeyboardSensor;
extern StructRNA RNA_Lamp;
extern StructRNA RNA_Lattice;
+extern StructRNA RNA_LatticeModifier;
extern StructRNA RNA_Library;
extern StructRNA RNA_MCol;
extern StructRNA RNA_MColLayer;
@@ -102,12 +123,15 @@
extern StructRNA RNA_MVert;
extern StructRNA RNA_MVertGroup;
extern StructRNA RNA_Main;
+extern StructRNA RNA_MaskModifier;
extern StructRNA RNA_Material;
extern StructRNA RNA_Mesh;
+extern StructRNA RNA_MeshDeformModifier;
extern StructRNA RNA_MessageSensor;
extern StructRNA RNA_MetaBall;
extern StructRNA RNA_MetaElement;
extern StructRNA RNA_MetaSequence;
+extern StructRNA RNA_MirrorModifier;
extern StructRNA RNA_Modifier;
extern StructRNA RNA_MouseSensor;
extern StructRNA RNA_MovieSequence;
@@ -117,12 +141,17 @@
extern StructRNA RNA_NodeTree;
extern StructRNA RNA_NorController;
extern StructRNA RNA_Object;
+extern StructRNA RNA_ObstacleFluidSettings;
extern StructRNA RNA_Operator;
extern StructRNA RNA_OperatorMousePath;
extern StructRNA RNA_OperatorProperties;
extern StructRNA RNA_OrController;
+extern StructRNA RNA_OutflowFluidSettings;
extern StructRNA RNA_PackedFile;
extern StructRNA RNA_Panel;
+extern StructRNA RNA_ParticleFluidSettings;
+extern StructRNA RNA_ParticleInstanceModifier;
+extern StructRNA RNA_ParticleSystemModifier;
extern StructRNA RNA_PluginSequence;
extern StructRNA RNA_PointerProperty;
extern StructRNA RNA_Property;
@@ -151,16 +180,23 @@
extern StructRNA RNA_ShapeKeyBezierPoint;
extern StructRNA RNA_ShapeKeyCurvePoint;
extern StructRNA RNA_ShapeKeyPoint;
+extern StructRNA RNA_ShrinkwrapModifier;
+extern StructRNA RNA_SimpleDeformModifier;
+extern StructRNA RNA_SmoothModifier;
+extern StructRNA RNA_SoftbodyModifier;
extern StructRNA RNA_Sound;
extern StructRNA RNA_SoundSequence;
extern StructRNA RNA_SpeedControlSequence;
extern StructRNA RNA_StringProperty;
extern StructRNA RNA_Struct;
+extern StructRNA RNA_SubsurfModifier;
extern StructRNA RNA_TextBox;
extern StructRNA RNA_TouchSensor;
extern StructRNA RNA_TransformSequence;
+extern StructRNA RNA_UVProjectModifier;
extern StructRNA RNA_UnknownType;
extern StructRNA RNA_VectorFont;
+extern StructRNA RNA_WaveModifier;
extern StructRNA RNA_WindowManager;
extern StructRNA RNA_WipeSequence;
extern StructRNA RNA_World;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-12-29 16:36:58 UTC (rev 18152)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2008-12-29 17:36:06 UTC (rev 18153)
@@ -906,6 +906,7 @@
{"rna_constraint.c", RNA_def_constraint},
{"rna_controller.c", RNA_def_controller},
{"rna_curve.c", RNA_def_curve},
+ {"rna_fluidsim.c", RNA_def_fluidsim},
{"rna_group.c", RNA_def_group},
{"rna_image.c", RNA_def_image},
{"rna_ipo.c", RNA_def_ipo},
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c 2008-12-29 16:36:58 UTC (rev 18152)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c 2008-12-29 17:36:06 UTC (rev 18153)
@@ -1,423 +1,423 @@
-/**
- * $Id$
- *
- * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Contributor(s): Blender Foundation (2008), Joshua Leung
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <stdlib.h>
-
-#include "RNA_define.h"
-#include "RNA_types.h"
-
-#include "rna_internal.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_scene_types.h"
-
-#ifdef RNA_RUNTIME
-
-
-static void rna_Bone_layer_set(PointerRNA *ptr, int index, int value)
-{
- Bone *bone= (Bone*)ptr->data;
-
- if(value) bone->layer |= (1<<index);
- else {
- bone->layer &= ~(1<<index);
- if(bone->layer == 0)
- bone->layer |= (1<<index);
- }
-}
-
-
-static void rna_Armature_layer_set(PointerRNA *ptr, int index, int value)
-{
- bArmature *arm= (bArmature*)ptr->data;
-
- if(value) arm->layer |= (1<<index);
- else {
- arm->layer &= ~(1<<index);
- if(arm->layer == 0)
- arm->layer |= (1<<index);
- }
-}
-
-static void rna_Armature_ghost_start_frame_set(PointerRNA *ptr, int value)
-{
- bArmature *data= (bArmature*)ptr->data;
- CLAMP(value, 1, data->ghostef);
- data->ghostsf= value;
-}
-
-static void rna_Armature_ghost_end_frame_set(PointerRNA *ptr, int value)
-{
- bArmature *data= (bArmature*)ptr->data;
- CLAMP(value, data->ghostsf, (int)(MAXFRAMEF/2));
- data->ghostef= value;
-}
-
-static void rna_Armature_path_start_frame_set(PointerRNA *ptr, int value)
-{
- bArmature *data= (bArmature*)ptr->data;
- CLAMP(value, 1, data->pathef);
- data->pathsf= value;
-}
-
-static void rna_Armature_path_end_frame_set(PointerRNA *ptr, int value)
-{
- bArmature *data= (bArmature*)ptr->data;
- CLAMP(value, data->pathsf, (int)(MAXFRAMEF/2));
- data->pathef= value;
-}
-
-#else
-
-// err... bones should not be directly edited (only editbones should be...)
-static void rna_def_bone(BlenderRNA *brna)
-{
- StructRNA *srna;
- PropertyRNA *prop;
-
- srna= RNA_def_struct(brna, "Bone", NULL);
- RNA_def_struct_ui_text(srna, "Bone", "member of the 'Armature' type");
-
- /* pointers/collections */
- /* parent (pointer) */
- prop= RNA_def_property(srna, "parent", PROP_POINTER, PROP_NONE);
- RNA_def_property_struct_type(prop, "Bone");
- RNA_def_property_pointer_sdna(prop, NULL, "parent");
- RNA_def_property_ui_text(prop, "Parent", "Parent bone (in same Armature).");
-
- /* children (collection) */
- prop= RNA_def_property(srna, "children", PROP_COLLECTION, PROP_NONE);
- RNA_def_property_collection_sdna(prop, NULL, "childbase", NULL);
- RNA_def_property_struct_type(prop, "Bone");
- RNA_def_property_ui_text(prop, "Children", "Bones which are children of this bone");
-
- /* strings */
- prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
- RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* must be unique */
- RNA_def_property_ui_text(prop, "Name", "");
- RNA_def_struct_name_property(srna, prop);
-
- /* flags */
- /* layer */
- prop= RNA_def_property(srna, "layer", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "layer", 1);
- RNA_def_property_array(prop, 16);
- RNA_def_property_ui_text(prop, "Bone Layers", "Layers bone exists in");
- RNA_def_property_boolean_funcs(prop, NULL, "rna_Bone_layer_set");
-
- /* flag */
- prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list