[Bf-blender-cvs] [eb1ff4b3a4c] master: Cleanup: CodeStyle format
Jeroen Bakker
noreply at git.blender.org
Wed Jan 6 13:55:39 CET 2021
Commit: eb1ff4b3a4cfb933f40206fb9c0ea918d79456a5
Author: Jeroen Bakker
Date: Wed Jan 6 13:55:27 2021 +0100
Branches: master
https://developer.blender.org/rBeb1ff4b3a4cfb933f40206fb9c0ea918d79456a5
Cleanup: CodeStyle format
===================================================================
M source/blender/draw/intern/draw_cache_impl_gpencil.c
M source/blender/draw/intern/draw_manager.h
M source/blender/draw/intern/draw_manager_data.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index b1814d54353..e1523db36c7 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -755,9 +755,9 @@ static void gpencil_edit_curve_stroke_count_cb(bGPDlayer *gpl,
}
static uint32_t gpencil_beztriple_vflag_get(char flag,
- char col_id,
- bool handle_point,
- const bool handle_selected)
+ char col_id,
+ bool handle_point,
+ const bool handle_selected)
{
uint32_t vflag = 0;
SET_FLAG_FROM_TEST(vflag, (flag & SELECT), VFLAG_VERT_SELECTED);
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index 295b0ed5e80..3ab60bc3c96 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -480,7 +480,7 @@ typedef struct DRWDebugSphere {
/* ------------- DRAW MANAGER ------------ */
-#define DST_MAX_SLOTS 64 /* Cannot be changed without modifying RST.bound_tex_slots */
+#define DST_MAX_SLOTS 64 /* Cannot be changed without modifying RST.bound_tex_slots */
#define MAX_CLIP_PLANES 6 /* GL_MAX_CLIP_PLANES is at least 6 */
#define STENCIL_UNDEFINED 256
#define DRW_DRAWLIST_LEN 256
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 8f21e9fa5ca..57b3373932e 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -514,10 +514,10 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
drw_call_calc_orco(ob, ob_infos->orcotexfac);
/* Random float value. */
uint random = (DST.dupli_source) ?
- DST.dupli_source->random_id :
- /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
- * put it in ob->runtime and make depsgraph ensure it is up to date. */
- BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
+ DST.dupli_source->random_id :
+ /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
+ * put it in ob->runtime and make depsgraph ensure it is up to date. */
+ BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
ob_infos->ob_random = random * (1.0f / (float)0xFFFFFFFF);
/* Object State. */
ob_infos->ob_flag = 1.0f; /* Required to have a correct sign */
More information about the Bf-blender-cvs
mailing list