[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30015] branches/particles-2010: svn merge -rHEAD:29575 https://svn.blender.org/svnroot/bf-blender/branches /particles-2010

Lukas Toenne lukas.toenne at googlemail.com
Tue Jul 6 09:41:50 CEST 2010


Revision: 30015
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30015
Author:   lukastoenne
Date:     2010-07-06 09:41:50 +0200 (Tue, 06 Jul 2010)

Log Message:
-----------
svn merge -rHEAD:29575 https://svn.blender.org/svnroot/bf-blender/branches/particles-2010

Rolling back to the start. It was decided that modifying the current particle system further would not be beneficial and a new separate particle system would better be created. This revert should make a fresh start. Usable features will be ported over step by step. The new system will follow the design described here: http://wiki.blender.org/index.php/User:Phonybone/ParticlesDesign

Modified Paths:
--------------
    branches/particles-2010/release/scripts/ui/properties_data_modifier.py
    branches/particles-2010/release/scripts/ui/properties_particle.py
    branches/particles-2010/source/blender/blenkernel/BKE_boids.h
    branches/particles-2010/source/blender/blenkernel/BKE_effect.h
    branches/particles-2010/source/blender/blenkernel/BKE_node.h
    branches/particles-2010/source/blender/blenkernel/BKE_pointcache.h
    branches/particles-2010/source/blender/blenkernel/intern/anim.c
    branches/particles-2010/source/blender/blenkernel/intern/boids.c
    branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
    branches/particles-2010/source/blender/blenkernel/intern/effect.c
    branches/particles-2010/source/blender/blenkernel/intern/library.c
    branches/particles-2010/source/blender/blenkernel/intern/node.c
    branches/particles-2010/source/blender/blenkernel/intern/object.c
    branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
    branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
    branches/particles-2010/source/blender/blenkernel/intern/smoke.c
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/blenloader/intern/writefile.c
    branches/particles-2010/source/blender/editors/include/ED_node.h
    branches/particles-2010/source/blender/editors/interface/interface_templates.c
    branches/particles-2010/source/blender/editors/object/object_add.c
    branches/particles-2010/source/blender/editors/object/object_edit.c
    branches/particles-2010/source/blender/editors/object/object_modifier.c
    branches/particles-2010/source/blender/editors/object/object_select.c
    branches/particles-2010/source/blender/editors/object/object_vgroup.c
    branches/particles-2010/source/blender/editors/physics/particle_boids.c
    branches/particles-2010/source/blender/editors/physics/particle_edit.c
    branches/particles-2010/source/blender/editors/physics/particle_object.c
    branches/particles-2010/source/blender/editors/physics/physics_intern.h
    branches/particles-2010/source/blender/editors/physics/physics_ops.c
    branches/particles-2010/source/blender/editors/physics/physics_pointcache.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/particles-2010/source/blender/editors/space_buttons/buttons_context.c
    branches/particles-2010/source/blender/editors/space_buttons/space_buttons.c
    branches/particles-2010/source/blender/editors/space_info/info_stats.c
    branches/particles-2010/source/blender/editors/space_node/drawnode.c
    branches/particles-2010/source/blender/editors/space_node/node_draw.c
    branches/particles-2010/source/blender/editors/space_node/node_edit.c
    branches/particles-2010/source/blender/editors/space_node/node_header.c
    branches/particles-2010/source/blender/editors/space_node/space_node.c
    branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
    branches/particles-2010/source/blender/editors/space_view3d/drawvolume.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
    branches/particles-2010/source/blender/editors/transform/transform.c
    branches/particles-2010/source/blender/editors/transform/transform_conversions.c
    branches/particles-2010/source/blender/editors/transform/transform_manipulator.c
    branches/particles-2010/source/blender/makesdna/DNA_modifier_types.h
    branches/particles-2010/source/blender/makesdna/DNA_node_types.h
    branches/particles-2010/source/blender/makesdna/DNA_particle_types.h
    branches/particles-2010/source/blender/makesdna/intern/makesdna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_boid.c
    branches/particles-2010/source/blender/makesrna/intern/rna_fluidsim.c
    branches/particles-2010/source/blender/makesrna/intern/rna_internal.h
    branches/particles-2010/source/blender/makesrna/intern/rna_main_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/particles-2010/source/blender/makesrna/intern/rna_object.c
    branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
    branches/particles-2010/source/blender/makesrna/intern/rna_space.c
    branches/particles-2010/source/blender/modifiers/MOD_modifiertypes.h
    branches/particles-2010/source/blender/modifiers/intern/MOD_bevel.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_build.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_decimate.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_explode.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_multires.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_shapekey.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_smooth.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_softbody.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_solidify.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_util.c
    branches/particles-2010/source/blender/nodes/CMakeLists.txt
    branches/particles-2010/source/blender/nodes/intern/CMP_util.h
    branches/particles-2010/source/blender/nodes/intern/SHD_util.h
    branches/particles-2010/source/blender/nodes/intern/TEX_util.h
    branches/particles-2010/source/blender/nodes/intern/node_util.c
    branches/particles-2010/source/blender/nodes/intern/node_util.h
    branches/particles-2010/source/blender/render/intern/source/convertblender.c
    branches/particles-2010/source/blender/render/intern/source/pointdensity.c
    branches/particles-2010/source/blender/windowmanager/WM_types.h

Added Paths:
-----------
    branches/particles-2010/source/blender/blenkernel/BKE_particle.h
    branches/particles-2010/source/blender/blenkernel/intern/particle.c

Removed Paths:
-------------
    branches/particles-2010/source/blender/blenkernel/BKE_particle_emitter.h
    branches/particles-2010/source/blender/blenkernel/BKE_particle_settings.h
    branches/particles-2010/source/blender/blenkernel/BKE_particle_system.h
    branches/particles-2010/source/blender/blenkernel/intern/particle_emitter.c
    branches/particles-2010/source/blender/blenkernel/intern/particle_settings.c
    branches/particles-2010/source/blender/makesdna/DNA_particle_link_types.h
    branches/particles-2010/source/blender/modifiers/intern/MOD_particleemitter.c
    branches/particles-2010/source/blender/nodes/PAR_node.h
    branches/particles-2010/source/blender/nodes/intern/PAR_nodes/
    branches/particles-2010/source/blender/nodes/intern/PAR_util.c
    branches/particles-2010/source/blender/nodes/intern/PAR_util.h
    branches/particles-2010/source/blender/nodes/intern/node_tree_composite.c
    branches/particles-2010/source/blender/nodes/intern/node_tree_particles.c
    branches/particles-2010/source/blender/nodes/intern/node_tree_shader.c
    branches/particles-2010/source/blender/nodes/intern/node_tree_texture.c

Modified: branches/particles-2010/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/particles-2010/release/scripts/ui/properties_data_modifier.py	2010-07-06 07:33:47 UTC (rev 30014)
+++ branches/particles-2010/release/scripts/ui/properties_data_modifier.py	2010-07-06 07:41:50 UTC (rev 30015)
@@ -460,9 +460,6 @@
             row.operator("object.multires_external_save", text="Save External...")
             row.label()
 
-    def PARTICLE_EMITTER(self, layout, ob, md, wide_ui):
-        layout.label(text="Internal.")
-
     def PARTICLE_INSTANCE(self, layout, ob, md, wide_ui):
         layout.prop(md, "object")
         layout.prop(md, "particle_system_number", text="Particle System")

Modified: branches/particles-2010/release/scripts/ui/properties_particle.py
===================================================================
--- branches/particles-2010/release/scripts/ui/properties_particle.py	2010-07-06 07:33:47 UTC (rev 30014)
+++ branches/particles-2010/release/scripts/ui/properties_particle.py	2010-07-06 07:41:50 UTC (rev 30015)
@@ -111,10 +111,6 @@
                 row.prop(part, "type", text="")
                 row.prop(psys, "seed")
 
-                row = layout.row()
-                row.prop(part, "page_size")
-                row.prop(part, "child_page_size")
-
                 split = layout.split(percentage=0.65)
                 if part.type == 'HAIR':
                     if psys.edited:
@@ -153,7 +149,6 @@
     def draw(self, context):
         layout = self.layout
 
-        ob = context.object
         psys = context.particle_system
         part = psys.settings
         wide_ui = context.region.width > narrowui
@@ -161,77 +156,8 @@
         layout.enabled = particle_panel_enabled(context, psys) and not psys.multiple_caches
 
         row = layout.row()
-        row.template_list(psys, "emitters", part, "active_emitter_index", rows=2)
-        col = row.column(align=True)
-        col.operator("object.particle_emitter_add", icon='ZOOMIN', text="")
-        col.operator("object.particle_emitter_remove", icon='ZOOMOUT', text="")
-        if part.active_emitter_index >= 0:
-            row = layout.row()
-            sub = row.row()
-            sub.label(text="Emitter Object:")
-            sub.prop(psys, "active_emitter_object", text="")
-            
-            emitter = part.emitters[part.active_emitter_index]
-            olas = psys.find_link_assignment(emitter.object_slot_id)
-            if olas:
-                row = layout.row()
-                row.label(text="Vertex Group")
-                row.label(text="Negate")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_density", ob, "vertex_groups", text="Density")
-                row.prop(olas, "vertex_group_density_negate", text="")
-        
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_velocity", ob, "vertex_groups", text="Velocity")
-                row.prop(olas, "vertex_group_velocity_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_length", ob, "vertex_groups", text="Length")
-                row.prop(olas, "vertex_group_length_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_clump", ob, "vertex_groups", text="Clump")
-                row.prop(olas, "vertex_group_clump_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_kink", ob, "vertex_groups", text="Kink")
-                row.prop(olas, "vertex_group_kink_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_roughness1", ob, "vertex_groups", text="Roughness 1")
-                row.prop(olas, "vertex_group_roughness1_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_roughness2", ob, "vertex_groups", text="Roughness 2")
-                row.prop(olas, "vertex_group_roughness2_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End")
-                row.prop(olas, "vertex_group_roughness_end_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_size", ob, "vertex_groups", text="Size")
-                row.prop(olas, "vertex_group_size_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_tangent", ob, "vertex_groups", text="Tangent")
-                row.prop(olas, "vertex_group_tangent_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_rotation", ob, "vertex_groups", text="Rotation")
-                row.prop(olas, "vertex_group_rotation_negate", text="")
-
-                row = layout.row()
-                row.prop_object(olas, "vertex_group_field", ob, "vertex_groups", text="Field")
-                row.prop(olas, "vertex_group_field_negate", text="")
-
-        row = layout.row()
         row.active = part.distribution != 'GRID'
         row.prop(part, "amount")
-        
-        row = layout.row()
-        row.prop(part, "emission_rate")
 
         if part.type != 'HAIR':
             split = layout.split()
@@ -1080,7 +1006,6 @@
         basic_force_field_falloff_ui(self, context, part.force_field_2)
 
 
-"""
 class PARTICLE_PT_vertexgroups(ParticleButtonsPanel):
     bl_label = "Vertexgroups"
     bl_default_closed = True
@@ -1146,7 +1071,6 @@
         row = layout.row()
         row.prop_object(psys, "vertex_group_field", ob, "vertex_groups", text="Field")
         row.prop(psys, "vertex_group_field_negate", text="")
-"""
 
 
 classes = [
@@ -1163,7 +1087,7 @@
     PARTICLE_PT_children,
     PARTICLE_PT_field_weights,
     PARTICLE_PT_force_fields,
-    #PARTICLE_PT_vertexgroups,
+    PARTICLE_PT_vertexgroups,
 
     PARTICLE_PT_custom_props]
 

Modified: branches/particles-2010/source/blender/blenkernel/BKE_boids.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_boids.h	2010-07-06 07:33:47 UTC (rev 30014)
+++ branches/particles-2010/source/blender/blenkernel/BKE_boids.h	2010-07-06 07:41:50 UTC (rev 30015)
@@ -1,4 +1,4 @@
-/* BKE_particle_system.h
+/* BKE_particle.h
  *
  *
  * $Id$
@@ -49,7 +49,7 @@
 
 void boids_precalc_rules(struct ParticleSettings *part, float cfra);
 void boid_brain(BoidBrainData *bbd, int p, struct ParticleData *pa);
-void boid_body(BoidBrainData *bbd, int p, struct ParticleData *pa);
+void boid_body(BoidBrainData *bbd, struct ParticleData *pa);
 void boid_default_settings(BoidSettings *boids);
 BoidRule *boid_new_rule(int type);
 BoidState *boid_new_state(BoidSettings *boids);

Modified: branches/particles-2010/source/blender/blenkernel/BKE_effect.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_effect.h	2010-07-06 07:33:47 UTC (rev 30014)
+++ branches/particles-2010/source/blender/blenkernel/BKE_effect.h	2010-07-06 07:41:50 UTC (rev 30015)
@@ -122,7 +122,7 @@
 void			pdEndEffectors(struct ListBase **effectors);
 void			pdDoEffectors(struct ListBase *effectors, struct ListBase *colliders, struct EffectorWeights *weights, struct EffectedPoint *point, float *force, float *impulse);
 
-void pd_point_from_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, int pa_bufpos, struct ParticleKey *state, struct EffectedPoint *point);
+void pd_point_from_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, struct ParticleKey *state, struct EffectedPoint *point);
 void pd_point_from_loc(struct Scene *scene, float *loc, float *vel, int index, struct EffectedPoint *point);
 void pd_point_from_soft(struct Scene *scene, float *loc, float *vel, int index, struct EffectedPoint *point);
 

Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h	2010-07-06 07:33:47 UTC (rev 30014)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h	2010-07-06 07:41:50 UTC (rev 30015)
@@ -33,8 +33,6 @@
 #ifndef BKE_NODE_H
 #define BKE_NODE_H
 
-#include "DNA_listBase.h"
-
 /* not very important, but the stack solver likes to know a maximum */
 #define MAX_SOCKET	64
 
@@ -46,16 +44,14 @@
 struct bNodeStack;
 struct uiLayout;
 struct rctf;
+struct ListBase;
 struct RenderData;
 struct Scene;
 struct Main;
 struct Tex;
-struct MTex;
 struct GPUMaterial;
 struct GPUNode;
 struct GPUNodeStack;
-struct ParticleSimulationData;
-struct ParticleSystem;
 struct PointerRNA;
 struct bContext;
 
@@ -68,7 +64,7 @@
 	float min, max;					/* default range for inputs */
 	
 	/* after this line is used internal only */
-	struct ListBase verified;			/* used during verify_types */
+	struct bNodeSocket *sock;		/* used during verify_types */
 	struct bNodeSocket *internsock;	/* group nodes, the internal socket counterpart */
 	int own_index;					/* verify group nodes */
 	
@@ -95,7 +91,7 @@
 	void (*copystoragefunc)(struct bNode *, struct bNode *);
 	
 	/* for use with dynamic typedefs */
-	struct ID *id;
+	ID *id;
 	void *pynode; /* holds pointer to python script */
 	void *pydict; /* holds pointer to python script dictionary (scope)*/
 
@@ -104,23 +100,6 @@
 
 } bNodeType;
 
-typedef void (*bNodeTreeCallback)(void *calldata, struct ID *owner_id, struct bNodeTree *ntree);
-typedef struct bNodeTreeTypeInfo
-{
-	int type;						/* type identifier */
-	char id_name[24];				/* id name for RNA identification */
-	
-	ListBase node_types;			/* type definitions */
-	
-	/* callbacks */
-	void (*freeCache)(struct bNodeTree *ntree);
-	void (*freeNodeCache)(struct bNodeTree *ntree, struct bNode *node);
-	void (*foreachNodeTree)(void *calldata, bNodeTreeCallback func);		/* iteration over all node trees */
-	void (*beginExec)(struct bNodeTree *ntree);
-	void (*endExec)(struct bNodeTree *ntree);
-	void (*exec)(struct bNodeTree *ntree, void *callerdata, int thread);
-} bNodeTreeTypeInfo;
-
 /* node->exec, now in use for composites (#define for break is same as ready yes) */
 #define NODE_PROCESSING	1
 #define NODE_READY		2

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list