[Bf-blender-cvs] [f7e73b5d457] blender-v2.83-release: Fix T77913: Incorrect handling of negative-scale bit in DRWResourceHandle

Jacques Lucke noreply at git.blender.org
Thu Jul 2 09:33:36 CEST 2020


Commit: f7e73b5d4577f930066b78faf8e472ade85ffecc
Author: Jacques Lucke
Date:   Wed Jun 24 14:42:46 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBf7e73b5d4577f930066b78faf8e472ade85ffecc

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 ff27fa958ef..26a1691d0dc 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -570,7 +570,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