diff options
author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-04-15 01:12:05 +0400 |
---|---|---|
committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-04-15 01:12:05 +0400 |
commit | 7d9067ca2c0487dd43c127cdc5d09b3565601991 (patch) | |
tree | 4be5c6628805bb1a838abac88d35bd2a7b912211 /source/blender | |
parent | a02a4f0fc4ae16ffc66b3a1efc9c3f649ac11acc (diff) |
Make memstat easier to read, add missing Intel ID and cleanups.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_transform.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 5f0c2e3d4be..2db86d70734 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -5075,7 +5075,7 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op) VECCOPY(pchan->eul, eul); } } - } + } // Duplicated in source/blender/editors/object/object_transform.c else { if (pchan->rotmode == ROT_MODE_QUAT) { pchan->quat[1]=pchan->quat[2]=pchan->quat[3]= 0.0f; diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 13b7f883922..c363a9858cb 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -208,7 +208,7 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op) VECCOPY(ob->rot, eul); } } - } + } // Duplicated in source/blender/editors/armature/editarmature.c else { if (ob->rotmode == ROT_MODE_QUAT) { ob->quat[1]=ob->quat[2]=ob->quat[3]= 0.0f; diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index d53b8e67c56..4eaf969ee8a 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -122,7 +122,10 @@ void GPU_extensions_init() GG.device = GPU_DEVICE_NVIDIA; GG.driver = GPU_DRIVER_OFFICIAL; } - else if(strstr(vendor, "Intel") || strstr(renderer, "Mesa DRI Intel")) { + else if(strstr(vendor, "Intel") || + /* src/mesa/drivers/dri/intel/intel_context.c */ + strstr(renderer, "Mesa DRI Intel") || + strstr(renderer, "Mesa DRI Mobile Intel")) { GG.device = GPU_DEVICE_INTEL; GG.driver = GPU_DRIVER_OFFICIAL; } |