[Bf-blender-cvs] [885d78150d0] blender2.8: Use eObjectMode for function arguments
Campbell Barton
noreply at git.blender.org
Tue Feb 6 13:26:03 CET 2018
Commit: 885d78150d092756c44519dd9fd19a4d88f02354
Author: Campbell Barton
Date: Tue Feb 6 23:27:49 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB885d78150d092756c44519dd9fd19a4d88f02354
Use eObjectMode for function arguments
===================================================================
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/paint.c
M source/blender/depsgraph/DEG_depsgraph.h
M source/blender/depsgraph/intern/depsgraph_eval.cc
M source/blender/draw/DRW_engine.h
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_manipulator.c
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/intern/gpu_draw.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 7cffc16e13e..34192db318e 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -77,6 +77,8 @@ struct SpaceClip;
struct ID;
struct EvaluationContext;
+#include "DNA_object_enums.h"
+
/* Structs */
struct bContext;
@@ -262,7 +264,7 @@ struct ToolSettings *CTX_data_tool_settings(const bContext *C);
const char *CTX_data_mode_string(const bContext *C);
int CTX_data_mode_enum_ex(
const struct Object *obedit, const struct Object *ob,
- const short object_mode);
+ const eObjectMode object_mode);
int CTX_data_mode_enum(const bContext *C);
void CTX_data_main_set(bContext *C, struct Main *bmain);
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 71ffa630e61..7ee70b12c91 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -50,6 +50,8 @@ struct RigidBodyWorld;
struct HookModifierData;
struct ModifierData;
+#include "DNA_object_enums.h"
+
void BKE_object_workob_clear(struct Object *workob);
void BKE_object_workob_calc_parent(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob, struct Object *workob);
@@ -113,9 +115,12 @@ void BKE_object_lod_add(struct Object *ob);
void BKE_object_lod_sort(struct Object *ob);
bool BKE_object_lod_remove(struct Object *ob, int level);
void BKE_object_lod_update(struct Object *ob, const float camera_position[3]);
-bool BKE_object_lod_is_usable(struct Object *ob, struct ViewLayer *view_layer, const short object_mode);
-struct Object *BKE_object_lod_meshob_get(struct Object *ob, struct ViewLayer *view_layer, const short object_mode);
-struct Object *BKE_object_lod_matob_get(struct Object *ob, struct ViewLayer *view_layer, const short object_mode);
+bool BKE_object_lod_is_usable(
+ struct Object *ob, struct ViewLayer *view_layer, const eObjectMode object_mode);
+struct Object *BKE_object_lod_meshob_get(
+ struct Object *ob, struct ViewLayer *view_layer, const eObjectMode object_mode);
+struct Object *BKE_object_lod_matob_get(
+ struct Object *ob, struct ViewLayer *view_layer, const eObjectMode object_mode);
void BKE_object_copy_data(struct Main *bmain, struct Object *ob_dst, const struct Object *ob_src, const int flag);
struct Object *BKE_object_copy(struct Main *bmain, const struct Object *ob);
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 5ca0843e667..0e40930e813 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -62,6 +62,8 @@ struct EvaluationContext;
enum eOverlayFlags;
+#include "DNA_object_enums.h"
+
extern const char PAINT_CURSOR_SCULPT[3];
extern const char PAINT_CURSOR_VERTEX_PAINT[3];
extern const char PAINT_CURSOR_WEIGHT_PAINT[3];
@@ -124,10 +126,10 @@ void BKE_paint_copy(struct Paint *src, struct Paint *tar, const int flag);
void BKE_paint_cavity_curve_preset(struct Paint *p, int preset);
-short BKE_paint_object_mode_from_paint_mode(ePaintMode mode);
+eObjectMode BKE_paint_object_mode_from_paint_mode(ePaintMode mode);
struct Paint *BKE_paint_get_active_from_paintmode(struct Scene *sce, ePaintMode mode);
struct Paint *BKE_paint_get_active(
- struct Scene *sce, struct ViewLayer *view_layer, const short object_mode);
+ struct Scene *sce, struct ViewLayer *view_layer, const eObjectMode object_mode);
struct Paint *BKE_paint_get_active_from_context(const struct bContext *C);
ePaintMode BKE_paintmode_get_active_from_context(const struct bContext *C);
struct Brush *BKE_paint_brush(struct Paint *paint);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 86c0b420f34..9ac4831a047 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -997,7 +997,7 @@ SceneCollection *CTX_data_scene_collection(const bContext *C)
return BKE_collection_master(&scene->id);
}
-int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const short object_mode)
+int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const eObjectMode object_mode)
{
// Object *obedit = CTX_data_edit_object(C);
if (obedit) {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 2e257a329ea..1cf926c609d 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -884,7 +884,7 @@ static LodLevel *lod_level_select(Object *ob, const float camera_position[3])
return current;
}
-bool BKE_object_lod_is_usable(Object *ob, ViewLayer *view_layer, const short object_mode)
+bool BKE_object_lod_is_usable(Object *ob, ViewLayer *view_layer, const eObjectMode object_mode)
{
bool active = (view_layer) ? ob == OBACT(view_layer) : false;
return (object_mode == OB_MODE_OBJECT || !active);
@@ -900,7 +900,7 @@ void BKE_object_lod_update(Object *ob, const float camera_position[3])
}
}
-static Object *lod_ob_get(Object *ob, ViewLayer *view_layer, int flag, const short object_mode)
+static Object *lod_ob_get(Object *ob, ViewLayer *view_layer, int flag, const eObjectMode object_mode)
{
LodLevel *current = ob->currentlod;
@@ -914,12 +914,12 @@ static Object *lod_ob_get(Object *ob, ViewLayer *view_layer, int flag, const sho
return current->source;
}
-struct Object *BKE_object_lod_meshob_get(Object *ob, ViewLayer *view_layer, const short object_mode)
+struct Object *BKE_object_lod_meshob_get(Object *ob, ViewLayer *view_layer, const eObjectMode object_mode)
{
return lod_ob_get(ob, view_layer, OB_LOD_USE_MESH, object_mode);
}
-struct Object *BKE_object_lod_matob_get(Object *ob, ViewLayer *view_layer, const short object_mode)
+struct Object *BKE_object_lod_matob_get(Object *ob, ViewLayer *view_layer, const eObjectMode object_mode)
{
return lod_ob_get(ob, view_layer, OB_LOD_USE_MAT, object_mode);
}
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index f0ad8de33b9..5ba4face835 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -159,7 +159,7 @@ Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode)
return NULL;
}
-Paint *BKE_paint_get_active(Scene *sce, ViewLayer *view_layer, const short object_mode)
+Paint *BKE_paint_get_active(Scene *sce, ViewLayer *view_layer, const eObjectMode object_mode)
{
if (sce && view_layer) {
ToolSettings *ts = sce->toolsettings;
@@ -178,6 +178,8 @@ Paint *BKE_paint_get_active(Scene *sce, ViewLayer *view_layer, const short objec
if (ts->use_uv_sculpt)
return &ts->uvsculpt->paint;
return &ts->imapaint.paint;
+ default:
+ break;
}
}
@@ -507,7 +509,7 @@ void BKE_paint_cavity_curve_preset(Paint *p, int preset)
curvemapping_changed(p->cavity_curve, false);
}
-short BKE_paint_object_mode_from_paint_mode(ePaintMode mode)
+eObjectMode BKE_paint_object_mode_from_paint_mode(ePaintMode mode)
{
switch (mode) {
case ePaintSculpt:
@@ -537,7 +539,7 @@ void BKE_paint_init(Scene *sce, ePaintMode mode, const char col[3])
/* If there's no brush, create one */
brush = BKE_paint_brush(paint);
if (brush == NULL) {
- short ob_mode = BKE_paint_object_mode_from_paint_mode(mode);
+ eObjectMode ob_mode = BKE_paint_object_mode_from_paint_mode(mode);
brush = BKE_brush_first_search(G.main, ob_mode);
if (!brush) {
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h
index e3d379666a0..8110899048d 100644
--- a/source/blender/depsgraph/DEG_depsgraph.h
+++ b/source/blender/depsgraph/DEG_depsgraph.h
@@ -75,6 +75,8 @@ typedef enum eEvaluationMode {
DAG_EVAL_RENDER = 2, /* evaluate for render purposes */
} eEvaluationMode;
+#include "DNA_object_enums.h"
+
/* Dependency graph evaluation context
*
* This structure stores all the local dependency graph data,
@@ -83,7 +85,7 @@ typedef enum eEvaluationMode {
typedef struct EvaluationContext {
eEvaluationMode mode;
float ctime;
- short object_mode;
+ eObjectMode object_mode;
struct Depsgraph *depsgraph;
struct ViewLayer *view_layer;
@@ -219,7 +221,7 @@ void DEG_evaluation_context_init_from_scene(
struct Scene *scene,
struct ViewLayer *view_layer,
struct RenderEngineType *engine_type,
- const short object_mode,
+ const eObjectMode object_mode,
eEvaluationMode mode);
/* Free evaluation context. */
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index d7d12bc6968..466808338f8 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -81,7 +81,7 @@ void DEG_evaluation_context_init_from_scene(
Scene *scene,
ViewLayer *view_layer,
RenderEngineType *engine_type,
- short object_mode,
+ eObjectMode object_mode,
eEvaluationMode mode)
{
DEG_evaluation_context_init(eval_ctx, mode);
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index 30470b227b4..9baad113c42 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -26,6 +26,8 @@
#ifndef __DRW_ENGINE_H__
#define __DRW_ENGINE_H__
+#include "BLI_sys_types.h" /* for bool */
+
struct ARegion;
struct CollectionEngineSettings;
struct Depsgraph;
@@ -50,7 +52,7 @@ struct RenderEngine;
struct RenderEngineType;
struct WorkSpace;
-#include "BLI_sys_types.h" /* for bool */
+#include "DNA_object_enums.h"
/* Buffer and textures used by the viewport by default */
typedef struct DefaultFramebufferList {
@@ -91,25 +93,25 @@ void DRW_draw_view(const struct bContext *C);
void DRW_draw_render_loop_ex(
struct Depsgraph *depsgraph,
struct RenderEngineType *engine_type,
- struct ARegion *ar, struct View3D *v3d, const short object_mode,
+ struct ARegion *ar, struct View3D *v3d, const eObjectMode object_mode,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list