Blender Git Commit Log

Git Commits -> Revision 6ecab6d

Revision 6ecab6d by Lukas Toenne (master)
December 28, 2016, 16:30 (GMT)
Revert particle system and point cache removal in blender2.8 branch.

This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0.

Due to postponement of particle system rewrite it was decided to put particle code
back into the 2.8 branch for the time being.

Commit Details:

Full Hash: 6ecab6dd8e48d564a2b43e0e81e79d079e8b4c77
Parent Commit: 6052631
Lines Changed: +43728, -401

23 Added Paths:

/intern/cycles/blender/blender_particles.cpp (+92, -0) (View)
/release/scripts/presets/hair_dynamics/default.py (+17, -0) (View)
/release/scripts/startup/bl_ui/properties_particle.py (+1408, -0) (View)
/source/blender/blenkernel/BKE_boids.h (+66, -0) (View)
/source/blender/blenkernel/BKE_particle.h (+481, -0) (View)
/source/blender/blenkernel/BKE_pointcache.h (+348, -0) (View)
/source/blender/blenkernel/intern/boids.c (+1618, -0) (View)
/source/blender/blenkernel/intern/particle.c (+4304, -0) (View)
/source/blender/blenkernel/intern/particle_child.c (+739, -0) (View)
/source/blender/blenkernel/intern/particle_distribute.c (+1476, -0) (View)
/source/blender/blenkernel/intern/particle_system.c (+4362, -0) (View)
/source/blender/blenkernel/intern/pointcache.c (+4095, -0) (View)
/source/blender/editors/include/ED_particle.h (+74, -0) (View)
/source/blender/editors/physics/particle_boids.c (+371, -0) (View)
/source/blender/editors/physics/particle_edit.c (+4923, -0) (View)
/source/blender/editors/physics/particle_object.c (+1244, -0) (View)
/source/blender/editors/physics/physics_pointcache.c (+469, -0) (View)
/source/blender/makesdna/DNA_boid_types.h (+225, -0) (View)
/source/blender/makesdna/DNA_particle_types.h (+613, -0) (View)
/source/blender/makesrna/intern/rna_boid.c (+674, -0) (View)
/source/blender/makesrna/intern/rna_particle.c (+3573, -0) (View)
/source/blender/modifiers/intern/MOD_particleinstance.c (+470, -0) (View)
/source/blender/modifiers/intern/MOD_particlesystem.c (+241, -0) (View)

203 Modified Paths:

/intern/cycles/blender/addon/properties.py (+45, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+68, -0) (Diff)
/intern/cycles/blender/blender_curves.cpp (+244, -1) (Diff)
/intern/cycles/blender/blender_object.cpp (+49, -11) (Diff)
/intern/cycles/blender/blender_sync.cpp (+8, -0) (Diff)
/intern/cycles/blender/blender_sync.h (+6, -0) (Diff)
/intern/cycles/blender/blender_util.h (+27, -0) (Diff)
/intern/cycles/blender/CMakeLists.txt (+1, -0) (Diff)
/intern/elbeem/extern/elbeem.h (+1, -1) (Diff)
/release/scripts/startup/bl_operators/object_quick_effects.py (+233, -0) (Diff)
/release/scripts/startup/bl_operators/presets.py (+30, -0) (Diff)
/release/scripts/startup/bl_operators/view3d.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+34, -0) (Diff)
/release/scripts/startup/bl_ui/properties_paint_common.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/properties_physics_cloth.py (+12, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_common.py (+107, -0) (Diff)
/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (+38, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_smoke.py (+34, -11) (Diff)
/release/scripts/startup/bl_ui/properties_physics_softbody.py (+12, -2) (Diff)
/release/scripts/startup/bl_ui/properties_scene.py (+21, -0) (Diff)
/release/scripts/startup/bl_ui/properties_texture.py (+66, -11) (Diff)
/release/scripts/startup/bl_ui/space_dopesheet.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/space_time.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+1, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+113, -2) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+101, -4) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+1, -0) (Diff)
/source/blender/alembic/intern/abc_exporter.cc (+17, -0) (Diff)
/source/blender/alembic/intern/abc_hair.cc (+6, -12) (Diff)
/source/blender/alembic/intern/abc_hair.h (+6, -4) (Diff)
/source/blender/alembic/intern/abc_mesh.cc (+1, -1) (Diff)
/source/blender/alembic/intern/abc_points.cc (+4, -6) (Diff)
/source/blender/alembic/intern/abc_points.h (+4, -2) (Diff)
/source/blender/blenkernel/BKE_cloth.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_context.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_dynamicpaint.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_effect.h (+8, -2) (Diff)
/source/blender/blenkernel/BKE_library.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_main.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_object.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_rigidbody.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_sca.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_softbody.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_texture.h (+3, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+9, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+10, -0) (Diff)
/source/blender/blenkernel/intern/bpath.c (+35, -0) (Diff)
/source/blender/blenkernel/intern/cloth.c (+83, -6) (Diff)
/source/blender/blenkernel/intern/context.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+196, -4) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+339, -6) (Diff)
/source/blender/blenkernel/intern/effect.c (+147, -8) (Diff)
/source/blender/blenkernel/intern/fluidsim.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/group.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/idcode.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/ipo.c (+72, -0) (Diff)
/source/blender/blenkernel/intern/library.c (+16, -0) (Diff)
/source/blender/blenkernel/intern/library_query.c (+67, -1) (Diff)
/source/blender/blenkernel/intern/library_remap.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/modifier.c (+7, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+188, -2) (Diff)
/source/blender/blenkernel/intern/object_deform.c (+9, -0) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+330, -2) (Diff)
/source/blender/blenkernel/intern/object_update.c (+48, -1) (Diff)
/source/blender/blenkernel/intern/rigidbody.c (+83, -10) (Diff)
/source/blender/blenkernel/intern/scene.c (+20, -0) (Diff)
/source/blender/blenkernel/intern/smoke.c (+302, -6) (Diff)
/source/blender/blenkernel/intern/softbody.c (+60, -8) (Diff)
/source/blender/blenkernel/intern/texture.c (+44, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+463, -2) (Diff)
/source/blender/blenloader/intern/versioning_250.c (+76, -1) (Diff)
/source/blender/blenloader/intern/versioning_260.c (+34, -2) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+100, -0) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+7, -0) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+207, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+226, -0) (Diff)
/source/blender/blentranslation/BLT_translation.h (+2, -0) (Diff)
/source/blender/CMakeLists.txt (+2, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc (+51, -0) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.cc (+143, -2) (Diff)
/source/blender/depsgraph/intern/builder/deg_builder_relations.h (+1, -1) (Diff)
/source/blender/depsgraph/intern/depsgraph_build.cc (+10, -1) (Diff)
/source/blender/depsgraph/intern/depsgraph_tag.cc (+37, -1) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+2, -1) (Diff)
/source/blender/editors/animation/anim_channels_edit.c (+5, -0) (Diff)
/source/blender/editors/animation/anim_filter.c (+72, -0) (Diff)
/source/blender/editors/include/ED_anim_api.h (+2, -0) (Diff)
/source/blender/editors/include/ED_buttons.h (+1, -0) (Diff)
/source/blender/editors/include/ED_object.h (+2, -0) (Diff)
/source/blender/editors/include/ED_physics.h (+5, -0) (Diff)
/source/blender/editors/interface/interface_icons.c (+2, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+46, -11) (Diff)
/source/blender/editors/object/object_add.c (+19, -0) (Diff)
/source/blender/editors/object/object_edit.c (+21, -1) (Diff)
/source/blender/editors/object/object_intern.h (+1, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+238, -45) (Diff)
/source/blender/editors/object/object_ops.c (+1, -0) (Diff)
/source/blender/editors/object/object_relations.c (+5, -0) (Diff)
/source/blender/editors/object/object_select.c (+40, -1) (Diff)
/source/blender/editors/physics/CMakeLists.txt (+4, -0) (Diff)
/source/blender/editors/physics/physics_intern.h (+67, -0) (Diff)
/source/blender/editors/physics/physics_ops.c (+149, -3) (Diff)
/source/blender/editors/render/render_shading.c (+10, -0) (Diff)
/source/blender/editors/screen/screen_context.c (+6, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+16, -0) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+105, -2) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+50, -0) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+7, -0) (Diff)
/source/blender/editors/space_file/filesel.c (+1, -1) (Diff)
/source/blender/editors/space_info/info_stats.c (+32, -2) (Diff)
/source/blender/editors/space_nla/nla_buttons.c (+1, -0) (Diff)
/source/blender/editors/space_nla/nla_channels.c (+2, -1) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+6, -0) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+16, -0) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+9, -0) (Diff)
/source/blender/editors/space_time/space_time.c (+162, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1198, -8) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw_legacy.c (+5, -0) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+4, -0) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+11, -1) (Diff)
/source/blender/editors/transform/transform.c (+1, -1) (Diff)
/source/blender/editors/transform/transform.h (+1, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+202, -1) (Diff)
/source/blender/editors/transform/transform_generics.c (+9, -0) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+27, -1) (Diff)
/source/blender/editors/transform/transform_orientations.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap.c (+8, -0) (Diff)
/source/blender/editors/transform/transform_snap_object.c (+16, -0) (Diff)
/source/blender/editors/util/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/util/undo.c (+29, -5) (Diff)
/source/blender/gpu/GPU_material.h (+15, -2) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+8, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+35, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+26, -1) (Diff)
/source/blender/makesdna/DNA_dynamicpaint_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+4, -1) (Diff)
/source/blender/makesdna/DNA_ipo_types.h (+39, -0) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+40, -2) (Diff)
/source/blender/makesdna/DNA_object_fluidsim.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_object_force.h (+109, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+6, -1) (Diff)
/source/blender/makesdna/DNA_outliner_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_rigidbody_types.h (+3, -0) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+36, -0) (Diff)
/source/blender/makesdna/DNA_smoke_types.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -1) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+1, -1) (Diff)
/source/blender/makesdna/intern/makesdna.c (+4, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+2, -0) (Diff)
/source/blender/makesrna/intern/makesrna.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_action.c (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_color.c (+8, -0) (Diff)
/source/blender/makesrna/intern/rna_context.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+54, -9) (Diff)
/source/blender/makesrna/intern/rna_fluidsim.c (+47, -1) (Diff)
/source/blender/makesrna/intern/rna_ID.c (+12, -0) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_main.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+46, -0) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+124, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+39, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+80, -0) (Diff)
/source/blender/makesrna/intern/rna_object_api.c (+49, -0) (Diff)
/source/blender/makesrna/intern/rna_object_force.c (+507, -87) (Diff)
/source/blender/makesrna/intern/rna_rigidbody.c (+13, -4) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+32, -1) (Diff)
/source/blender/makesrna/intern/rna_sculpt_paint.c (+321, -1) (Diff)
/source/blender/makesrna/intern/rna_smoke.c (+85, -17) (Diff)
/source/blender/makesrna/intern/rna_space.c (+18, -1) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+45, -0) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+4, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+24, -0) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+1, -0) (Diff)
/source/blender/modifiers/CMakeLists.txt (+2, -0) (Diff)
/source/blender/modifiers/intern/MOD_build.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_cloth.c (+11, -2) (Diff)
/source/blender/modifiers/intern/MOD_collision.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+942, -1) (Diff)
/source/blender/modifiers/intern/MOD_laplaciandeform.c (+1, -2) (Diff)
/source/blender/modifiers/intern/MOD_shapekey.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_smooth.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_softbody.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+2, -0) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+2, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_particle_info.c (+6, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+1280, -11) (Diff)
/source/blender/render/intern/source/pipeline.c (+27, -1) (Diff)
/source/blender/render/intern/source/pointdensity.c (+262, -6) (Diff)
/source/blender/render/intern/source/renderdatabase.c (+31, -1) (Diff)
/source/blender/render/intern/source/shadeinput.c (+1, -0) (Diff)
/source/blender/render/intern/source/voxeldata.c (+17, -2) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -1) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+5, -0) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021