archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert particle system and point cache removal in blender2.8 branch.

Browse Source 
This reverts commit 5aa19be912 and b4a721af69.

Due to postponement of particle system rewrite it was decided to put particle code
back into the 2.8 branch for the time being.
This commit is contained in:
Lukas Tönne
2016-12-28 17:30:58 +01:00
parent 605263177b
commit 6ecab6dd8e
226 changed files with 43731 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/transform/transform_snap.c
View File

@@ -519,6 +519,8 @@ static void initSnappingMode(TransInfo *t)
{
ToolSettings *ts = t->settings;
Object *obedit = t->obedit;
Scene *scene = t->scene;
Base *base_act = scene->basact;
if (t->spacetype == SPACE_NODE) {
/* force project off when not supported */
@@ -557,6 +559,12 @@ static void initSnappingMode(TransInfo *t)
t->tsnap.modeSelect = t->tsnap.snap_self ? SNAP_ALL : SNAP_NOT_ACTIVE;
}
}
/* Particles edit mode*/
else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
(obedit == NULL && base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT))
{
t->tsnap.modeSelect = SNAP_ALL;
}
/* Object mode */
else if (t->tsnap.applySnap != NULL && // A snapping function actually exist
(obedit == NULL) ) // Object Mode