From 84a7941c3eee91b621cfcef39a45f11de7da90ea Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Thu, 17 May 2012 17:10:36 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8068
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/fix_rigid.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fix_rigid.cpp b/src/fix_rigid.cpp
index 2ff57ae4bd..4b4ce28891 100644
--- a/src/fix_rigid.cpp
+++ b/src/fix_rigid.cpp
@@ -711,7 +711,8 @@ void FixRigid::init()
     for (i = 0; i < nlocal; i++) {
       if (body[i] < 0) continue;
       ibody = body[i];
-      massone = rmass[i];
+      if (rmass) massone = rmass[i];
+      else massone = mass[type[i]];
 
       if (eflags[i] & SPHERE) {
 	sum[ibody][0] += SINERTIA*massone * radius[i]*radius[i];
@@ -908,7 +909,8 @@ void FixRigid::init()
     for (i = 0; i < nlocal; i++) {
       if (body[i] < 0) continue;
       ibody = body[i];
-      massone = rmass[i];
+      if (rmass) massone = rmass[i];
+      else massone = mass[type[i]];
 
       if (eflags[i] & SPHERE) {
 	sum[ibody][0] += SINERTIA*massone * radius[i]*radius[i];