griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

correct typo in previous commit & minor changes.

Browse Source
This commit is contained in:
Campbell Barton
2013-07-05 00:13:14 +00:00
parent 7132bfe664
commit 32e917be8d
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -1945,7 +1945,7 @@ int editbmesh_modifier_is_enabled(Scene *scene, ModifierData *md, DerivedMesh *d
static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, DerivedMesh **cage_r,
DerivedMesh **final_r,
CustomDataMask dataMask)
{
{
ModifierData *md, *previewmd = NULL;
float (*deformedVerts)[3] = NULL;
CustomDataMask mask, previewmask = 0, append_mask = 0;

2
source/blender/blenkernel/intern/particle_system.c
View File

@@ -4313,7 +4313,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra)
/* SPH_SOLVER_CLASSICAL */
/* Apply SPH forces using classical algorithm (due to Gingold
* and Monaghan). Note that, unlike double-density relaxation,
* this algorthim is separated into distinct loops. */
* this algorithm is separated into distinct loops. */
#pragma omp parallel for firstprivate (sphdata) private (pa) schedule(dynamic,5)
LOOP_DYNAMIC_PARTICLES {

3
source/blender/editors/interface/resources.c
View File

@@ -2094,8 +2094,7 @@ void init_userdef_do_versions(void)
if (U.ndof_sensitivity == 0.0f) {
U.ndof_sensitivity = 1.0f;
U.ndof_flag = NDOF_LOCK_HORIZON |
NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM | NDOF_SHOULD_ROTATE;
U.ndof_flag = (NDOF_LOCK_HORIZON | NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM | NDOF_SHOULD_ROTATE);
}
if (U.ndof_orbit_sensitivity == 0.0f) {

2
source/blender/render/intern/source/convertblender.c
View File

@@ -5248,7 +5248,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
re->scene= scene;
re->lay= lay;
if(re->r.scemode & R_VIEWPORT_PREVIEW)
if (re->r.scemode & R_VIEWPORT_PREVIEW)
re->scene_color_manage = BKE_scene_check_color_management_enabled(scene);
/* scene needs to be set to get camera */