[Bf-blender-cvs] [756e664e4f4] master: Fix T77913: Incorrect handling of negative-scale bit in DRWResourceHandle

Jacques Lucke noreply at git.blender.org
Wed Jun 24 14:45:16 CEST 2020


Commit: 756e664e4f4474401627d261f35e35a2b198bea6
Author: Jacques Lucke
Date:   Wed Jun 24 14:42:46 2020 +0200
Branches: master
https://developer.blender.org/rB756e664e4f4474401627d261f35e35a2b198bea6

Fix T77913: Incorrect handling of negative-scale bit in DRWResourceHandle

Reviewers: fclem

Differential Revision: https://developer.blender.org/D8103

===================================================================

M	source/blender/draw/intern/draw_manager_data.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 01cecc338c7..8a99907e5db 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -577,7 +577,7 @@ uint32_t DRW_object_resource_id_get(Object *UNUSED(ob))
     /* Handle not yet allocated. Return next handle. */
     handle = DST.resource_handle;
   }
-  return handle;
+  return handle & ~(1 << 31);
 }
 
 static DRWResourceHandle drw_resource_handle(DRWShadingGroup *shgroup,



More information about the Bf-blender-cvs mailing list